修改消息组件

db/base.sql

@@ -75,7 +75,6 @@ INSERT INTO `mortals_xhx_menu` VALUES (9104, '菜单信息', '/menu/list', 91, 4
 INSERT INTO `mortals_xhx_menu` VALUES (9105, '参数信息', '/param/list', 91, 50, 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, 3, NULL, NULL, NULL);
 INSERT INTO `mortals_xhx_menu` VALUES (9106, '任务信息', '/task/list', 91, 60, 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, 3, NULL, NULL, NULL);
 INSERT INTO `mortals_xhx_menu` VALUES (9107, '操作日志', '/oper/log/list', 91, 70, 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, 3, NULL, NULL, NULL);
-INSERT INTO `mortals_xhx_menu` VALUES (9133, '站点管理', '/site/list', 91, NULL, 1, 0, 1, NULL, 'view', NULL, NULL, 0, 0, 3, '2021-11-03 21:51:48', 1, '系统管理员');
 
 
 -- ----------------------------

db/menu.sql

+-- ----------------------------
+-- 设备生产厂商菜单 SQL
+-- ----------------------------
+INSERT INTO `mortals_xhx_menu` VALUES (null, '设备生产厂商', '/firm/list', 0, 1, 1, 0, 0,'',NULL, NULL, NULL, 0, 0, 1, NULL, NULL, NULL);
+
+-- ----------------------------
+-- 设备生产厂商资源路径 SQL
+-- ----------------------------
+INSERT INTO `mortals_xhx_resource` VALUES (null, '设备生产厂商-菜单管理-查看', '/firm/list,/firm/view,/firm/info,/firm/export,/firm/exportExcel,/firm/downloadTemplate,/firm/download', 3, 0, NULL, NULL, NULL, 0);
+INSERT INTO `mortals_xhx_resource` VALUES (null, '设备生产厂商-菜单管理-维护', '/firm/add,/firm/edit,/firm/delete,/firm/logicDelete,/firm/save,/firm/importData', 3, 0, NULL, NULL, NULL, 0);
+-- ----------------------------
+-- 设备菜单 SQL
+-- ----------------------------
+INSERT INTO `mortals_xhx_menu` VALUES (null, '设备', '/device/list', 0, 1, 1, 0, 0,'',NULL, NULL, NULL, 0, 0, 1, NULL, NULL, NULL);
+
+-- ----------------------------
+-- 设备资源路径 SQL
+-- ----------------------------
+INSERT INTO `mortals_xhx_resource` VALUES (null, '设备-菜单管理-查看', '/device/list,/device/view,/device/info,/device/export,/device/exportExcel,/device/downloadTemplate,/device/download', 3, 0, NULL, NULL, NULL, 0);
+INSERT INTO `mortals_xhx_resource` VALUES (null, '设备-菜单管理-维护', '/device/add,/device/edit,/device/delete,/device/logicDelete,/device/save,/device/importData', 3, 0, NULL, NULL, NULL, 0);
+-- ----------------------------
+-- 平台系统菜单 SQL
+-- ----------------------------
+INSERT INTO `mortals_xhx_menu` VALUES (null, '平台系统', '/platform/list', 0, 1, 1, 0, 0,'',NULL, NULL, NULL, 0, 0, 1, NULL, NULL, NULL);
+
+-- ----------------------------
+-- 平台系统资源路径 SQL
+-- ----------------------------
+INSERT INTO `mortals_xhx_resource` VALUES (null, '平台系统-菜单管理-查看', '/platform/list,/platform/view,/platform/info,/platform/export,/platform/exportExcel,/platform/downloadTemplate,/platform/download', 3, 0, NULL, NULL, NULL, 0);
+INSERT INTO `mortals_xhx_resource` VALUES (null, '平台系统-菜单管理-维护', '/platform/add,/platform/edit,/platform/delete,/platform/logicDelete,/platform/save,/platform/importData', 3, 0, NULL, NULL, NULL, 0);
+-- ----------------------------
+-- 产品菜单 SQL
+-- ----------------------------
+INSERT INTO `mortals_xhx_menu` VALUES (null, '产品', '/product/list', 0, 1, 1, 0, 0,'',NULL, NULL, NULL, 0, 0, 1, NULL, NULL, NULL);
+
+-- ----------------------------
+-- 产品资源路径 SQL
+-- ----------------------------
+INSERT INTO `mortals_xhx_resource` VALUES (null, '产品-菜单管理-查看', '/product/list,/product/view,/product/info,/product/export,/product/exportExcel,/product/downloadTemplate,/product/download', 3, 0, NULL, NULL, NULL, 0);
+INSERT INTO `mortals_xhx_resource` VALUES (null, '产品-菜单管理-维护', '/product/add,/product/edit,/product/delete,/product/logicDelete,/product/save,/product/importData', 3, 0, NULL, NULL, NULL, 0);
+-- ----------------------------
+-- 设备日志菜单 SQL
+-- ----------------------------
+INSERT INTO `mortals_xhx_menu` VALUES (null, '设备日志', '/device/log/list', 0, 1, 1, 0, 0,'',NULL, NULL, NULL, 0, 0, 1, NULL, NULL, NULL);
+
+-- ----------------------------
+-- 设备日志资源路径 SQL
+-- ----------------------------
+INSERT INTO `mortals_xhx_resource` VALUES (null, '设备日志-菜单管理-查看', '/device/log/list,/device/log/view,/device/log/info,/device/log/export,/device/log/exportExcel,/device/log/downloadTemplate,/device/log/download', 3, 0, NULL, NULL, NULL, 0);
+INSERT INTO `mortals_xhx_resource` VALUES (null, '设备日志-菜单管理-维护', '/device/log/add,/device/log/edit,/device/log/delete,/device/log/logicDelete,/device/log/save,/device/log/importData', 3, 0, NULL, NULL, NULL, 0);

db/module.sql

 -- ----------------------------
+-- 设备生产厂商表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_firm`;
+CREATE TABLE mortals_xhx_firm(
+    `id` bigint(20)   AUTO_INCREMENT  COMMENT '主键ID，主键，自增长',
+    `firmName` varchar(128) NOT NULL    COMMENT '设备生产厂商名称',
+    `firmCode` varchar(128)     COMMENT '设备生产商编码',
+    `firmRemark` varchar(64)     COMMENT '备注',
+    `createUserId` bigint(20) NOT NULL    COMMENT '创建用户',
+    `createTime` datetime NOT NULL    COMMENT '创建时间',
+    `updateUserId` bigint(20)     COMMENT '更新用户',
+    `updateTime` datetime     COMMENT '更新时间',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备生产厂商';
+-- ----------------------------
 -- 设备表
 -- ----------------------------
 DROP TABLE IF EXISTS `mortals_xhx_device`;
@@ -6,14 +21,18 @@ CREATE TABLE mortals_xhx_device(
     `id` bigint(20)   AUTO_INCREMENT  COMMENT '主键ID，主键，自增长',
     `deviceName` varchar(20) NOT NULL    COMMENT '设备名称',
     `deviceCode` varchar(256)     COMMENT '设备编码',
-    `deviceType` tinyint(2) NOT NULL    COMMENT '设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）',
+    `siteCode` varchar(256)     COMMENT '站点编号，来源基础服务平台',
+    `siteName` varchar(256)     COMMENT '站点名称',
     `deviceMac` varchar(64)     COMMENT '设备的MAC地址',
+    `platformId` bigint(20) NOT NULL    COMMENT '平台系统Id',
+    `platformName` varchar(256) NOT NULL    COMMENT '平台系统名称',
+    `productId` bigint(20) NOT NULL    COMMENT '产品Id',
+    `productName` varchar(256) NOT NULL    COMMENT '产品名称',
+    `deviceFirmId` bigint(20)     COMMENT '设备生产厂商ID',
+    `deviceFirmname` varchar(20)     COMMENT '设备生产厂商名称',
     `ip` varchar(64)     COMMENT '设备访问ip',
     `centernum` varchar(64)     COMMENT '中心设备编码',
     `port` varchar(64)     COMMENT '端口',
-    `siteNum` varchar(64)     COMMENT '站点编号',
-    `deviceFirmId` bigint(20)     COMMENT '设备生产厂商ID',
-    `deviceFirmname` varchar(20)     COMMENT '设备生产厂商名称',
     `deviceOnlineStatus` tinyint(2) NOT NULL    COMMENT '在线状态 (0.离线，1.在线)',
     `status` tinyint(2) NOT NULL    COMMENT '启用状态 (0.停止，1.启用)',
     `active` tinyint(2) NOT NULL    COMMENT '激活状态 (0.未激活，1.已激活)',
@@ -28,86 +47,53 @@ PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备';
 
 -- ----------------------------
--- 设备生产厂商表
+-- 平台系统表
 -- ----------------------------
-DROP TABLE IF EXISTS `mortals_xhx_firm`;
-CREATE TABLE mortals_xhx_firm(
+DROP TABLE IF EXISTS `mortals_xhx_platform`;
+CREATE TABLE mortals_xhx_platform(
     `id` bigint(20)   AUTO_INCREMENT  COMMENT '主键ID，主键，自增长',
-    `firmName` varchar(128) NOT NULL    COMMENT '设备生产厂商名称',
-    `firmCode` varchar(128)     COMMENT '设备生产商编码',
-    `firmRemark` varchar(64)     COMMENT '备注',
+    `platformName` varchar(20) NOT NULL    COMMENT '平台名称，名称唯一',
+    `platformSn` varchar(256) NOT NULL    COMMENT '平台编码，编码唯一(编码加上站点编码，如phxt-51010251-1做Vhost虚拟机编码)',
+    `sendMsgType` tinyint(2) NOT NULL    COMMENT '发送第三方平台消息类型(0.http,1.jms)',
+    `sendConfig` varchar(2048)     COMMENT '发送参数配置，如发送消息地址等，xml结构,根据消息类型变化',
+    `sendSwitch` tinyint(2) NOT NULL    COMMENT '是否启用发送消息(0.停用,1.启用)',
+    `platformRemark` varchar(256)     COMMENT '备注',
     `createUserId` bigint(20) NOT NULL    COMMENT '创建用户',
     `createTime` datetime NOT NULL    COMMENT '创建时间',
     `updateUserId` bigint(20)     COMMENT '更新用户',
     `updateTime` datetime     COMMENT '更新时间',
 PRIMARY KEY  (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备生产厂商';
-
-
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='平台系统';
+-- ----------------------------
+-- 产品表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_product`;
+CREATE TABLE mortals_xhx_product(
+    `id` bigint(20)   AUTO_INCREMENT  COMMENT '主键ID，主键，自增长',
+    `productName` varchar(20) NOT NULL    COMMENT '产品名称，名称唯一',
+    `productCode` varchar(256) NOT NULL    COMMENT '产品编码，编码唯一',
+    `exchangeName` varchar(256) NOT NULL    COMMENT '交换机名称,英文必填，默认产品编码',
+    `productRemark` varchar(256)     COMMENT '备注',
+    `createUserId` bigint(20) NOT NULL    COMMENT '创建用户',
+    `createTime` datetime NOT NULL    COMMENT '创建时间',
+    `updateUserId` bigint(20)     COMMENT '更新用户',
+    `updateTime` datetime     COMMENT '更新时间',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='产品';
 -- ----------------------------
 -- 设备日志表
 -- ----------------------------
 DROP TABLE IF EXISTS `mortals_xhx_device_log`;
 CREATE TABLE mortals_xhx_device_log(
     `id` bigint(20)   AUTO_INCREMENT  COMMENT '主键ID，主键，自增长',
-    `deviceId` bigint(20)    COMMENT '设备ID',
+    `deviceId` bigint(20)     COMMENT '设备ID',
     `deviceNum` varchar(32) NOT NULL    COMMENT '设备编号',
     `deviceName` varchar(32) NOT NULL    COMMENT '设备名称，设置设备名称。',
     `logType` tinyint(2) NOT NULL    COMMENT '日志类型，(0.上报事件，1.下发服务)',
     `content` varchar(2048)     COMMENT '内容',
+    `createUserId` bigint(20) NOT NULL    COMMENT '创建用户',
     `createTime` datetime NOT NULL    COMMENT '创建时间',
+    `updateUserId` bigint(20)     COMMENT '更新用户',
+    `updateTime` datetime     COMMENT '更新时间',
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备日志';
-
-
-
--- ----------------------------
--- 设备菜单 SQL
--- ----------------------------
-INSERT INTO `mortals_xhx_menu` VALUES (null, '设备', '/device/list', 0, 1, 1, 0, 0,'',NULL, NULL, NULL, 0, 0, 1, NULL, NULL, NULL);
-
--- ----------------------------
--- 设备资源路径 SQL
--- ----------------------------
-INSERT INTO `mortals_xhx_resource` VALUES (null, '设备-菜单管理-查看', '/device/list,/device/view,/device/info,/device/export,/device/exportExcel,/device/downloadTemplate,/device/download', 3, 0, NULL, NULL, NULL, 0);
-INSERT INTO `mortals_xhx_resource` VALUES (null, '设备-菜单管理-维护', '/device/add,/device/edit,/device/delete,/device/logicDelete,/device/save,/device/importData', 3, 0, NULL, NULL, NULL, 0);
-
--- ----------------------------
--- 设备参数 SQL
--- ----------------------------
-INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型', 'Device', 'deviceType', '1', '呼叫器', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
-INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型', 'Device', 'deviceType', '2', '窗口屏', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
-INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型', 'Device', 'deviceType', '3', '评价器', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
-INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型', 'Device', 'deviceType', '4', '集中屏', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
-INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型', 'Device', 'deviceType', '5', '排号机', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
-INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型', 'Device', 'deviceType', '6', 'im设备', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
-INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型', 'Device', 'deviceType', '7', '样表设备', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
-INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型', 'Device', 'deviceType', '8', '取件柜', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
-INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型', 'Device', 'deviceType', '9', '信息发布', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
-INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型', 'Device', 'deviceType', '10', '导视机', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
-INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型', 'Device', 'deviceType', '11', '开标室设备', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
-INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型', 'Device', 'deviceType', '12', '背靠背', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
-INSERT INTO `mortals_xhx_param` VALUES (null, '在线状态 ', 'Device', 'deviceOnlineStatus', '0', '离线', 1, 4, 0, 'deviceOnlineStatus', NULL, NULL, NULL);
-INSERT INTO `mortals_xhx_param` VALUES (null, '在线状态 ', 'Device', 'deviceOnlineStatus', '1', '在线', 1, 4, 0, 'deviceOnlineStatus', NULL, NULL, NULL);
-INSERT INTO `mortals_xhx_param` VALUES (null, '启用状态 ', 'Device', 'status', '0', '停止', 1, 4, 0, 'status', NULL, NULL, NULL);
-INSERT INTO `mortals_xhx_param` VALUES (null, '启用状态 ', 'Device', 'status', '1', '启用', 1, 4, 0, 'status', NULL, NULL, NULL);
-INSERT INTO `mortals_xhx_param` VALUES (null, '激活状态 ', 'Device', 'active', '0', '未激活', 1, 4, 0, 'active', NULL, NULL, NULL);
-INSERT INTO `mortals_xhx_param` VALUES (null, '激活状态 ', 'Device', 'active', '1', '已激活', 1, 4, 0, 'active', NULL, NULL, NULL);
-
-
-
-
-
-
--- ----------------------------
--- 设备生产厂商菜单 SQL
--- ----------------------------
-INSERT INTO `mortals_xhx_menu` VALUES (null, '设备生产厂商', '/firm/list', 0, 1, 1, 0, 0,'',NULL, NULL, NULL, 0, 0, 1, NULL, NULL, NULL);
-
--- ----------------------------
--- 设备生产厂商资源路径 SQL
--- ----------------------------
-INSERT INTO `mortals_xhx_resource` VALUES (null, '设备生产厂商-菜单管理-查看', '/firm/list,/firm/view,/firm/info,/firm/export,/firm/exportExcel,/firm/downloadTemplate,/firm/download', 3, 0, NULL, NULL, NULL, 0);
-INSERT INTO `mortals_xhx_resource` VALUES (null, '设备生产厂商-菜单管理-维护', '/firm/add,/firm/edit,/firm/delete,/firm/logicDelete,/firm/save,/firm/importData', 3, 0, NULL, NULL, NULL, 0);
-
-

db/params.sql

+
+-- ----------------------------
+-- 设备生产厂商参数 SQL
+-- ----------------------------
+
+-- ----------------------------
+-- 设备参数 SQL
+-- ----------------------------
+INSERT INTO `mortals_xhx_param` VALUES (null, '在线状态 ', 'Device', 'deviceOnlineStatus', '0', '离线', 1, 4, 0, 'deviceOnlineStatus', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '在线状态 ', 'Device', 'deviceOnlineStatus', '1', '在线', 1, 4, 0, 'deviceOnlineStatus', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '启用状态 ', 'Device', 'status', '0', '停止', 1, 4, 0, 'status', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '启用状态 ', 'Device', 'status', '1', '启用', 1, 4, 0, 'status', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '激活状态 ', 'Device', 'active', '0', '未激活', 1, 4, 0, 'active', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '激活状态 ', 'Device', 'active', '1', '已激活', 1, 4, 0, 'active', NULL, NULL, NULL);
+
+-- ----------------------------
+-- 平台系统参数 SQL
+-- ----------------------------
+INSERT INTO `mortals_xhx_param` VALUES (null, '发送第三方平台消息类型', 'Platform', 'sendMsgType', '0', 'http', 1, 4, 0, 'sendMsgType', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '发送第三方平台消息类型', 'Platform', 'sendMsgType', '1', 'jms', 1, 4, 0, 'sendMsgType', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '是否启用发送消息', 'Platform', 'sendSwitch', '0', '停用', 1, 4, 0, 'sendSwitch', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '是否启用发送消息', 'Platform', 'sendSwitch', '1', '启用', 1, 4, 0, 'sendSwitch', NULL, NULL, NULL);
+
+-- ----------------------------
+-- 产品参数 SQL
+-- ----------------------------
+
+-- ----------------------------
+-- 设备日志参数 SQL
+-- ----------------------------
+INSERT INTO `mortals_xhx_param` VALUES (null, '日志类型，', 'DeviceLog', 'logType', '0', '上报事件', 1, 4, 0, 'logType', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '日志类型，', 'DeviceLog', 'logType', '1', '下发服务', 1, 4, 0, 'logType', NULL, NULL, NULL);

device-manager/pom.xml

@@ -61,7 +61,6 @@
 		<dependency>
 			<groupId>io.jsonwebtoken</groupId>
 			<artifactId>jjwt</artifactId>
-			<version>0.9.1</version>
 		</dependency>
 
 

device-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntity.java

@@ -306,6 +306,32 @@ public class UserEntity extends UserEntityExt implements IUser {
     public Integer getUserType() {
         return this.userType;
     }
+
+    @Override
+    public String getToken() {
+        return null;
+    }
+
+    @Override
+    public Long getLoginTime() {
+        return null;
+    }
+
+    @Override
+    public Long getExpireTime() {
+        return null;
+    }
+
+    @Override
+    public void setExpireTime(Long expireTime) {
+
+    }
+
+    @Override
+    public String getMenuUrl() {
+        return null;
+    }
+
     /**
     * 设置 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2
     * @param userType

device-manager/src/main/java/com/mortals/xhx/busiz/req/DeviceReq.java

@@ -31,5 +31,15 @@ public class DeviceReq implements Serializable {
 
     private String centernum;
 
+    private Boolean isAdmin;
+
+    private Boolean isManager;
+
+
+    public static void main(String[] args) {
+//        DeviceReq deviceReq = new DeviceReq();
+//        deviceReq.setIsAdmin();
+//        deviceReq.seti
+    }
 
 }

device-manager/src/main/java/com/mortals/xhx/busiz/security/DeviceTokenService.java

@@ -96,7 +96,7 @@ public class DeviceTokenService {
      * @return 令牌
      */
     public String createToken(DeviceEntity device) {
-        String token = IdUtil.fastUUID();
+        String token = IdUtil.fastSimpleUUID();
         device.setToken(token);
         refreshToken(device);
         Map<String, Object> claims = new HashMap<>();

device-manager/src/main/java/com/mortals/xhx/busiz/security/SecurityUtils.java

 package com.mortals.xhx.busiz.security;
 
-import com.mortals.framework.common.HttpStatus;
-import com.mortals.framework.exception.AppException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;

device-manager/src/main/java/com/mortals/xhx/busiz/security/filter/DeviceSubmitInterceptor.java

@@ -10,6 +10,7 @@ import com.mortals.xhx.common.code.ApiRespCodeEnum;
 import com.mortals.xhx.module.device.model.DeviceEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.method.HandlerMethod;
 
 import javax.servlet.http.HttpServletRequest;
@@ -52,13 +53,11 @@ public class DeviceSubmitInterceptor extends BaseInterceptor {
 
     public boolean verifyDevice(HttpServletRequest request) {
         DeviceEntity device = deviceTokenService.getLoginDevice(request);
-        if (StringUtils.isNotNull(device) && StringUtils.isNull(SecurityUtils.getAuthentication())) {
+        if (!ObjectUtils.isEmpty(device) ) {
             deviceTokenService.verifyToken(device);
             return true;
         }
         return false;
 
     }
-
-
 }

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

@@ -79,7 +79,7 @@ public class DeviceApiController {
                 deviceEntity.setDeviceOnlineStatus(DeviceOnlineStatusEnum.在线.getValue());
                 deviceEntity.setIp(req.getIp());
                 deviceEntity.setPort(req.getPort());
-                deviceEntity.setSiteNum(req.getSitenum());
+                //deviceEntity.setSiteNum(req.getSitenum());
                 deviceEntity.setCenternum(req.getCenternum());
                 deviceService.update(deviceEntity);
             } else {
@@ -90,7 +90,7 @@ public class DeviceApiController {
                 deviceEntity.setDeviceMac(req.getDeviceMac());
                 deviceEntity.setIp(req.getIp());
                 deviceEntity.setPort(req.getPort());
-                deviceEntity.setSiteNum(req.getSitenum());
+                //deviceEntity.set(req.getSitenum());
                 deviceEntity.setCenternum(req.getCenternum());
                 deviceEntity.setCreateUserId(1L);
                 deviceEntity.setCreateTime(new Date());

device-manager/src/main/java/com/mortals/xhx/common/code/SendMsgTypeEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 发送第三方平台消息类型(0.http,1.jms)枚举类
+*
+* @author zxfei
+*/
+public enum SendMsgTypeEnum {
+    http(0, "http"),
+    jms(1, "jms");
+    private Integer value;
+    private String desc;
+
+    SendMsgTypeEnum(Integer value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public Integer getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static SendMsgTypeEnum getByValue(Integer value) {
+        for (SendMsgTypeEnum sendMsgTypeEnum : SendMsgTypeEnum.values()) {
+            if (sendMsgTypeEnum.getValue() == value) {
+                return sendMsgTypeEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(Integer... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (SendMsgTypeEnum item : SendMsgTypeEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (Integer e : eItem) {
+                    if (item.getValue() == e) {
+                        hasE = true;
+                        break;
+                    }
+                }
+                if (!hasE) {
+                    resultMap.put(item.getValue() + "", item.getDesc());
+                }
+            } catch (Exception ex) {
+
+            }
+        }
+        return resultMap;
+    }
+}
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/common/code/SendSwitchEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 是否启用发送消息(0.停用,1.启用)枚举类
+*
+* @author zxfei
+*/
+public enum SendSwitchEnum {
+    停用(0, "停用"),
+    启用(1, "启用");
+    private Integer value;
+    private String desc;
+
+    SendSwitchEnum(Integer value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public Integer getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static SendSwitchEnum getByValue(Integer value) {
+        for (SendSwitchEnum sendSwitchEnum : SendSwitchEnum.values()) {
+            if (sendSwitchEnum.getValue() == value) {
+                return sendSwitchEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(Integer... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (SendSwitchEnum item : SendSwitchEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (Integer e : eItem) {
+                    if (item.getValue() == e) {
+                        hasE = true;
+                        break;
+                    }
+                }
+                if (!hasE) {
+                    resultMap.put(item.getValue() + "", item.getDesc());
+                }
+            } catch (Exception ex) {
+
+            }
+        }
+        return resultMap;
+    }
+}
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceMsgComsumerStartedService.java

@@ -84,7 +84,7 @@ public class DeviceMsgComsumerStartedService implements IApplicationStartedServi
                                 deviceEntity.setDeviceOnlineStatus(DeviceOnlineStatusEnum.在线.getValue());
                                 deviceEntity.setIp(deviceReq.getIp());
                                 deviceEntity.setPort(deviceReq.getPort());
-                                deviceEntity.setSiteNum(deviceReq.getSitenum());
+                               // deviceEntity.setSiteNum(deviceReq.getSitenum());
                                 deviceEntity.setCenternum(deviceReq.getCenternum());
                                 deviceService.update(deviceEntity);
 

device-manager/src/main/java/com/mortals/xhx/daemon/task/DeviceStatTaskImpl.java

@@ -16,6 +16,7 @@ import com.mortals.xhx.module.device.model.DeviceLogEntity;
 import com.mortals.xhx.module.device.model.DeviceLogQuery;
 import com.mortals.xhx.module.device.service.DeviceLogService;
 import com.mortals.xhx.module.device.service.DeviceService;
+import com.mortals.xhx.module.product.service.ProductService;
 import lombok.extern.apachecommons.CommonsLog;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -41,6 +42,8 @@ public class DeviceStatTaskImpl implements ITaskExcuteService {
     private DeviceLogService deviceLogService;
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private ProductService productService;
 
 
     @Override
@@ -56,7 +59,6 @@ public class DeviceStatTaskImpl implements ITaskExcuteService {
      */
     private void doDeviceUpOrDown() {
         int timeout = GlobalSysInfo.getParamIntValue(ParamKey.SYS_PARAM_HEADBEAT_TIMEOUT, 60) * 1000;
-        Map<String, String> deviceTypeMap = paramService.getParamBySecondOrganize("Device", "deviceType");
         try {
             //获取所有设备，针对每个设备查询最近指定秒的日志，如果没有则更新下线
             deviceService.getCacheList().stream()
@@ -71,7 +73,7 @@ public class DeviceStatTaskImpl implements ITaskExcuteService {
                             device.setOfflineTime(new Date());
                             device.setDeviceOnlineStatus(DeviceOnlineStatusEnum.离线.getValue());
                             deviceService.update(device);
-                            String msg = String.format("%s设备:%s  ,离线！", deviceTypeMap.get(device.getDeviceType().toString()), device.getDeviceCode());
+                            String msg = String.format("%s设备:%s  ,离线！", device.getProductName(), device.getDeviceCode());
                             WebSocketUtil.broadcast(SendToAllRequest.TYPE, new SendToAllRequest().setContent(msg));
 
                         }

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

@@ -8,306 +8,360 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.device.model.vo.DeviceVo;
 /**
- * 设备实体对象
- *
- * @author zxfei
- * @date 2022-04-11
- */
+* 设备实体对象
+*
+* @author zxfei
+* @date 2022-04-25
+*/
 
 public class DeviceEntity extends DeviceVo {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 设备名称
-     */
+    * 设备名称
+    */
     @Excel(name = "设备名称")
     private String deviceName;
     /**
-     * 设备编码
-     */
+    * 设备编码
+    */
     private String deviceCode;
     /**
-     * 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
-     */
-    private Integer deviceType;
+    * 站点编号（来源基础服务平台）
+    */
+    private String siteCode;
     /**
-     * 设备的MAC地址
-     */
+    * 设备的MAC地址
+    */
     private String deviceMac;
     /**
-     * 设备访问ip
-     */
-    private String ip;
+    * 平台系统Id
+    */
+    private Long platformId;
     /**
-     * 中心设备编码
-     */
-    private String centernum;
+    * 平台系统名称
+    */
+    private String platformName;
     /**
-     * 端口
-     */
-    private String port;
+    * 产品Id
+    */
+    private Long productId;
     /**
-     * 站点编号
-     */
-    private String siteNum;
+    * 产品Id
+    */
+    private String productName;
     /**
-     * 设备生产厂商ID
-     */
+    * 设备生产厂商ID
+    */
     private Long deviceFirmId;
     /**
-     * 设备生产厂商名称
-     */
+    * 设备生产厂商名称
+    */
     @Excel(name = "设备生产厂商名称")
     private String deviceFirmname;
     /**
-     * 在线状态 (0.离线，1.在线)
-     */
+    * 设备访问ip
+    */
+    private String ip;
+    /**
+    * 中心设备编码
+    */
+    private String centernum;
+    /**
+    * 端口
+    */
+    private String port;
+    /**
+    * 在线状态 (0.离线，1.在线)
+    */
     private Integer deviceOnlineStatus;
     /**
-     * 启用状态 (0.停止，1.启用)
-     */
+    * 启用状态 (0.停止，1.启用)
+    */
     private Integer status;
     /**
-     * 激活状态 (0.未激活，1.已激活)
-     */
+    * 激活状态 (0.未激活，1.已激活)
+    */
     private Integer active;
     /**
-     * 备注
-     */
+    * 备注
+    */
     private String deviceRemark;
     /**
-     * 最近上线时间
-     */
+    * 最近上线时间
+    */
     private Date onlineTime;
     /**
-     * 最近离线时间
-     */
+    * 最近离线时间
+    */
     private Date offlineTime;
 
 
 
     public DeviceEntity(){}
     /**
-     * 获取 设备名称
-     * @return String
-     */
+    * 获取 设备名称
+    * @return String
+    */
     public String getDeviceName(){
         return deviceName;
     }
     /**
-     * 设置 设备名称
-     * @param deviceName
-     */
+    * 设置 设备名称
+    * @param deviceName
+    */
     public void setDeviceName(String deviceName){
         this.deviceName = deviceName;
     }
     /**
-     * 获取 设备编码
-     * @return String
-     */
+    * 获取 设备编码
+    * @return String
+    */
     public String getDeviceCode(){
         return deviceCode;
     }
     /**
-     * 设置 设备编码
-     * @param deviceCode
-     */
+    * 设置 设备编码
+    * @param deviceCode
+    */
     public void setDeviceCode(String deviceCode){
         this.deviceCode = deviceCode;
     }
     /**
-     * 获取 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
-     * @return Integer
-     */
-    public Integer getDeviceType(){
-        return deviceType;
+    * 获取 站点编号（来源基础服务平台）
+    * @return String
+    */
+    public String getSiteCode(){
+        return siteCode;
     }
     /**
-     * 设置 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
-     * @param deviceType
-     */
-    public void setDeviceType(Integer deviceType){
-        this.deviceType = deviceType;
+    * 设置 站点编号（来源基础服务平台）
+    * @param siteCode
+    */
+    public void setSiteCode(String siteCode){
+        this.siteCode = siteCode;
     }
     /**
-     * 获取 设备的MAC地址
-     * @return String
-     */
+    * 获取 设备的MAC地址
+    * @return String
+    */
     public String getDeviceMac(){
         return deviceMac;
     }
     /**
-     * 设置 设备的MAC地址
-     * @param deviceMac
-     */
+    * 设置 设备的MAC地址
+    * @param deviceMac
+    */
     public void setDeviceMac(String deviceMac){
         this.deviceMac = deviceMac;
     }
     /**
-     * 获取 设备访问ip
-     * @return String
-     */
-    public String getIp(){
-        return ip;
+    * 获取 平台系统Id
+    * @return Long
+    */
+    public Long getPlatformId(){
+        return platformId;
     }
     /**
-     * 设置 设备访问ip
-     * @param ip
-     */
-    public void setIp(String ip){
-        this.ip = ip;
+    * 设置 平台系统Id
+    * @param platformId
+    */
+    public void setPlatformId(Long platformId){
+        this.platformId = platformId;
     }
     /**
-     * 获取 中心设备编码
-     * @return String
-     */
-    public String getCenternum(){
-        return centernum;
+    * 获取 平台系统名称
+    * @return String
+    */
+    public String getPlatformName(){
+        return platformName;
     }
     /**
-     * 设置 中心设备编码
-     * @param centernum
-     */
-    public void setCenternum(String centernum){
-        this.centernum = centernum;
+    * 设置 平台系统名称
+    * @param platformName
+    */
+    public void setPlatformName(String platformName){
+        this.platformName = platformName;
     }
     /**
-     * 获取 端口
-     * @return String
-     */
-    public String getPort(){
-        return port;
+    * 获取 产品Id
+    * @return Long
+    */
+    public Long getProductId(){
+        return productId;
     }
     /**
-     * 设置 端口
-     * @param port
-     */
-    public void setPort(String port){
-        this.port = port;
+    * 设置 产品Id
+    * @param productId
+    */
+    public void setProductId(Long productId){
+        this.productId = productId;
     }
     /**
-     * 获取 站点编号
-     * @return String
-     */
-    public String getSiteNum(){
-        return siteNum;
+    * 获取 产品Id
+    * @return String
+    */
+    public String getProductName(){
+        return productName;
     }
     /**
-     * 设置 站点编号
-     * @param siteNum
-     */
-    public void setSiteNum(String siteNum){
-        this.siteNum = siteNum;
+    * 设置 产品Id
+    * @param productName
+    */
+    public void setProductName(String productName){
+        this.productName = productName;
     }
     /**
-     * 获取 设备生产厂商ID
-     * @return Long
-     */
+    * 获取 设备生产厂商ID
+    * @return Long
+    */
     public Long getDeviceFirmId(){
         return deviceFirmId;
     }
     /**
-     * 设置 设备生产厂商ID
-     * @param deviceFirmId
-     */
+    * 设置 设备生产厂商ID
+    * @param deviceFirmId
+    */
     public void setDeviceFirmId(Long deviceFirmId){
         this.deviceFirmId = deviceFirmId;
     }
     /**
-     * 获取 设备生产厂商名称
-     * @return String
-     */
+    * 获取 设备生产厂商名称
+    * @return String
+    */
     public String getDeviceFirmname(){
         return deviceFirmname;
     }
     /**
-     * 设置 设备生产厂商名称
-     * @param deviceFirmname
-     */
+    * 设置 设备生产厂商名称
+    * @param deviceFirmname
+    */
     public void setDeviceFirmname(String deviceFirmname){
         this.deviceFirmname = deviceFirmname;
     }
     /**
-     * 获取 在线状态 (0.离线，1.在线)
-     * @return Integer
-     */
+    * 获取 设备访问ip
+    * @return String
+    */
+    public String getIp(){
+        return ip;
+    }
+    /**
+    * 设置 设备访问ip
+    * @param ip
+    */
+    public void setIp(String ip){
+        this.ip = ip;
+    }
+    /**
+    * 获取 中心设备编码
+    * @return String
+    */
+    public String getCenternum(){
+        return centernum;
+    }
+    /**
+    * 设置 中心设备编码
+    * @param centernum
+    */
+    public void setCenternum(String centernum){
+        this.centernum = centernum;
+    }
+    /**
+    * 获取 端口
+    * @return String
+    */
+    public String getPort(){
+        return port;
+    }
+    /**
+    * 设置 端口
+    * @param port
+    */
+    public void setPort(String port){
+        this.port = port;
+    }
+    /**
+    * 获取 在线状态 (0.离线，1.在线)
+    * @return Integer
+    */
     public Integer getDeviceOnlineStatus(){
         return deviceOnlineStatus;
     }
     /**
-     * 设置 在线状态 (0.离线，1.在线)
-     * @param deviceOnlineStatus
-     */
+    * 设置 在线状态 (0.离线，1.在线)
+    * @param deviceOnlineStatus
+    */
     public void setDeviceOnlineStatus(Integer deviceOnlineStatus){
         this.deviceOnlineStatus = deviceOnlineStatus;
     }
     /**
-     * 获取 启用状态 (0.停止，1.启用)
-     * @return Integer
-     */
+    * 获取 启用状态 (0.停止，1.启用)
+    * @return Integer
+    */
     public Integer getStatus(){
         return status;
     }
     /**
-     * 设置 启用状态 (0.停止，1.启用)
-     * @param status
-     */
+    * 设置 启用状态 (0.停止，1.启用)
+    * @param status
+    */
     public void setStatus(Integer status){
         this.status = status;
     }
     /**
-     * 获取 激活状态 (0.未激活，1.已激活)
-     * @return Integer
-     */
+    * 获取 激活状态 (0.未激活，1.已激活)
+    * @return Integer
+    */
     public Integer getActive(){
         return active;
     }
     /**
-     * 设置 激活状态 (0.未激活，1.已激活)
-     * @param active
-     */
+    * 设置 激活状态 (0.未激活，1.已激活)
+    * @param active
+    */
     public void setActive(Integer active){
         this.active = active;
     }
     /**
-     * 获取 备注
-     * @return String
-     */
+    * 获取 备注
+    * @return String
+    */
     public String getDeviceRemark(){
         return deviceRemark;
     }
     /**
-     * 设置 备注
-     * @param deviceRemark
-     */
+    * 设置 备注
+    * @param deviceRemark
+    */
     public void setDeviceRemark(String deviceRemark){
         this.deviceRemark = deviceRemark;
     }
     /**
-     * 获取 最近上线时间
-     * @return Date
-     */
+    * 获取 最近上线时间
+    * @return Date
+    */
     public Date getOnlineTime(){
         return onlineTime;
     }
     /**
-     * 设置 最近上线时间
-     * @param onlineTime
-     */
+    * 设置 最近上线时间
+    * @param onlineTime
+    */
     public void setOnlineTime(Date onlineTime){
         this.onlineTime = onlineTime;
     }
     /**
-     * 获取 最近离线时间
-     * @return Date
-     */
+    * 获取 最近离线时间
+    * @return Date
+    */
     public Date getOfflineTime(){
         return offlineTime;
     }
     /**
-     * 设置 最近离线时间
-     * @param offlineTime
-     */
+    * 设置 最近离线时间
+    * @param offlineTime
+    */
     public void setOfflineTime(Date offlineTime){
         this.offlineTime = offlineTime;
     }
@@ -317,7 +371,7 @@ public class DeviceEntity extends DeviceVo {
 
     @Override
     public int hashCode() {
-        return this.getId().hashCode();
+         return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -325,7 +379,7 @@ public class DeviceEntity extends DeviceVo {
         if (obj instanceof DeviceEntity) {
             DeviceEntity tmp = (DeviceEntity) obj;
             if (this.getId() == tmp.getId()) {
-                return true;
+                 return true;
             }
         }
         return false;
@@ -335,14 +389,17 @@ public class DeviceEntity extends DeviceVo {
         StringBuilder sb = new StringBuilder("");
         sb.append(",deviceName:").append(getDeviceName());
         sb.append(",deviceCode:").append(getDeviceCode());
-        sb.append(",deviceType:").append(getDeviceType());
+        sb.append(",siteCode:").append(getSiteCode());
         sb.append(",deviceMac:").append(getDeviceMac());
+        sb.append(",platformId:").append(getPlatformId());
+        sb.append(",platformName:").append(getPlatformName());
+        sb.append(",productId:").append(getProductId());
+        sb.append(",productName:").append(getProductName());
+        sb.append(",deviceFirmId:").append(getDeviceFirmId());
+        sb.append(",deviceFirmname:").append(getDeviceFirmname());
         sb.append(",ip:").append(getIp());
         sb.append(",centernum:").append(getCenternum());
         sb.append(",port:").append(getPort());
-        sb.append(",siteNum:").append(getSiteNum());
-        sb.append(",deviceFirmId:").append(getDeviceFirmId());
-        sb.append(",deviceFirmname:").append(getDeviceFirmname());
         sb.append(",deviceOnlineStatus:").append(getDeviceOnlineStatus());
         sb.append(",status:").append(getStatus());
         sb.append(",active:").append(getActive());
@@ -354,36 +411,42 @@ public class DeviceEntity extends DeviceVo {
 
     public void initAttrValue(){
 
-        this.deviceName = "";
+            this.deviceName = "";
+
+            this.deviceCode = "";
+
+            this.siteCode = "";
+
+            this.deviceMac = "";
 
-        this.deviceCode = "";
+            this.platformId = null;
 
-        this.deviceType = 1;
+            this.platformName = "";
 
-        this.deviceMac = "";
+            this.productId = null;
 
-        this.ip = "";
+            this.productName = "";
 
-        this.centernum = "";
+            this.deviceFirmId = null;
 
-        this.port = "";
+            this.deviceFirmname = "";
 
-        this.siteNum = "";
+            this.ip = "";
 
-        this.deviceFirmId = null;
+            this.centernum = "";
 
-        this.deviceFirmname = "";
+            this.port = "";
 
-        this.deviceOnlineStatus = 0;
+            this.deviceOnlineStatus = 0;
 
-        this.status = 1;
+            this.status = 0;
 
-        this.active = 0;
+            this.active = 0;
 
-        this.deviceRemark = "";
+            this.deviceRemark = "";
 
-        this.onlineTime = null;
+            this.onlineTime = null;
 
-        this.offlineTime = null;
+            this.offlineTime = null;
     }
 }
\ No newline at end of file

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

@@ -10,7 +10,7 @@ import com.mortals.xhx.module.device.model.vo.DeviceLogVo;
 * 设备日志实体对象
 *
 * @author zxfei
-* @date 2022-03-09
+* @date 2022-04-25
 */
 
 public class DeviceLogEntity extends DeviceLogVo {
@@ -148,7 +148,7 @@ public class DeviceLogEntity extends DeviceLogVo {
 
             this.deviceName = "";
 
-            this.logType = 0;
+            this.logType = null;
 
             this.content = "";
     }

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

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.device.model.DeviceLogEntity;
 * 设备日志查询对象
 *
 * @author zxfei
-* @date 2022-03-09
+* @date 2022-04-25
 */
 public class DeviceLogQuery extends DeviceLogEntity {
     /** 开始 主键ID，主键，自增长 */
@@ -54,12 +54,42 @@ public class DeviceLogQuery extends DeviceLogEntity {
     /** 内容 */
     private List<String> contentList;
 
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
     /** 开始 创建时间 */
     private String createTimeStart;
 
     /** 结束 创建时间 */
     private String createTimeEnd;
 
+    /** 开始 更新用户 */
+    private Long updateUserIdStart;
+
+    /** 结束 更新用户 */
+    private Long updateUserIdEnd;
+
+    /** 增加 更新用户 */
+    private Long updateUserIdIncrement;
+
+    /** 更新用户列表 */
+    private List <Long> updateUserIdList;
+
+    /** 开始 更新时间 */
+    private String updateTimeStart;
+
+    /** 结束 更新时间 */
+    private String updateTimeEnd;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<DeviceLogQuery> orConditionList;
 
@@ -305,6 +335,70 @@ public class DeviceLogQuery extends DeviceLogEntity {
     public void setContentList(List<String> contentList){
         this.contentList = contentList;
     }
+    /**
+    * 获取 开始 创建用户
+    * @return createUserIdStart
+    */
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
+    }
+
+    /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+    }
+
+    /**
+    * 获取 结束 创建用户
+    * @return $createUserIdEnd
+    */
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 创建用户
+    * @return createUserIdIncrement
+    */
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdList
+    */
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+    }
+
     /**
     * 获取 开始 创建时间
     * @return createTimeStart
@@ -337,6 +431,102 @@ public class DeviceLogQuery extends DeviceLogEntity {
         this.createTimeEnd = createTimeEnd;
     }
 
+    /**
+    * 获取 开始 更新用户
+    * @return updateUserIdStart
+    */
+    public Long getUpdateUserIdStart(){
+        return this.updateUserIdStart;
+    }
+
+    /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public void setUpdateUserIdStart(Long updateUserIdStart){
+        this.updateUserIdStart = updateUserIdStart;
+    }
+
+    /**
+    * 获取 结束 更新用户
+    * @return $updateUserIdEnd
+    */
+    public Long getUpdateUserIdEnd(){
+        return this.updateUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public void setUpdateUserIdEnd(Long updateUserIdEnd){
+        this.updateUserIdEnd = updateUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 更新用户
+    * @return updateUserIdIncrement
+    */
+    public Long getUpdateUserIdIncrement(){
+        return this.updateUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
+        this.updateUserIdIncrement = updateUserIdIncrement;
+    }
+
+    /**
+    * 获取 更新用户
+    * @return updateUserIdList
+    */
+    public List<Long> getUpdateUserIdList(){
+        return this.updateUserIdList;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public void setUpdateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+    }
+
+    /**
+    * 获取 开始 更新时间
+    * @return updateTimeStart
+    */
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
+    }
+
+    /**
+    * 设置 开始 更新时间
+    * @param updateTimeStart
+    */
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
+    }
+
+    /**
+    * 获取 结束 更新时间
+    * @return updateTimeEnd
+    */
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
+    }
+
+    /**
+    * 设置 结束 更新时间
+    * @param updateTimeEnd
+    */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
+
     /**
     * 设置  主键ID，主键，自增长
     * @param id
@@ -529,6 +719,97 @@ public class DeviceLogQuery extends DeviceLogEntity {
 		return this;
     }
 
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public DeviceLogQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public DeviceLogQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public DeviceLogQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public DeviceLogQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public DeviceLogQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+
+    /**
+    * 设置  更新用户
+    * @param updateUserId
+    */
+    public DeviceLogQuery updateUserId(Long updateUserId){
+	    setUpdateUserId(updateUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public DeviceLogQuery updateUserIdStart(Long updateUserIdStart){
+		this.updateUserIdStart = updateUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public DeviceLogQuery updateUserIdEnd(Long updateUserIdEnd){
+		this.updateUserIdEnd = updateUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public DeviceLogQuery updateUserIdIncrement(Long updateUserIdIncrement){
+		this.updateUserIdIncrement = updateUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public DeviceLogQuery updateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+		return this;
+        }
+
 
     /**
     * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)

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

@@ -4,11 +4,11 @@ import java.util.Date;
 import java.util.List;
 import com.mortals.xhx.module.device.model.DeviceEntity;
 /**
- * 设备查询对象
- *
- * @author zxfei
- * @date 2022-04-11
- */
+* 设备查询对象
+*
+* @author zxfei
+* @date 2022-04-25
+*/
 public class DeviceQuery extends DeviceEntity {
     /** 开始 主键ID，主键，自增长 */
     private Long idStart;
@@ -28,32 +28,41 @@ public class DeviceQuery extends DeviceEntity {
     /** 设备编码 */
     private List<String> deviceCodeList;
 
-    /** 开始 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背） */
-    private Integer deviceTypeStart;
+    /** 站点编号（来源基础服务平台） */
+    private List<String> siteCodeList;
 
-    /** 结束 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背） */
-    private Integer deviceTypeEnd;
+    /** 设备的MAC地址 */
+    private List<String> deviceMacList;
 
-    /** 增加 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背） */
-    private Integer deviceTypeIncrement;
+    /** 开始 平台系统Id */
+    private Long platformIdStart;
 
-    /** 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）列表 */
-    private List <Integer> deviceTypeList;
+    /** 结束 平台系统Id */
+    private Long platformIdEnd;
 
-    /** 设备的MAC地址 */
-    private List<String> deviceMacList;
+    /** 增加 平台系统Id */
+    private Long platformIdIncrement;
 
-    /** 设备访问ip */
-    private List<String> ipList;
+    /** 平台系统Id列表 */
+    private List <Long> platformIdList;
 
-    /** 中心设备编码 */
-    private List<String> centernumList;
+    /** 平台系统名称 */
+    private List<String> platformNameList;
 
-    /** 端口 */
-    private List<String> portList;
+    /** 开始 产品Id */
+    private Long productIdStart;
+
+    /** 结束 产品Id */
+    private Long productIdEnd;
+
+    /** 增加 产品Id */
+    private Long productIdIncrement;
+
+    /** 产品Id列表 */
+    private List <Long> productIdList;
 
-    /** 站点编号 */
-    private List<String> siteNumList;
+    /** 产品Id */
+    private List<String> productNameList;
 
     /** 开始 设备生产厂商ID */
     private Long deviceFirmIdStart;
@@ -70,6 +79,15 @@ public class DeviceQuery extends DeviceEntity {
     /** 设备生产厂商名称 */
     private List<String> deviceFirmnameList;
 
+    /** 设备访问ip */
+    private List<String> ipList;
+
+    /** 中心设备编码 */
+    private List<String> centernumList;
+
+    /** 端口 */
+    private List<String> portList;
+
     /** 开始 在线状态 (0.离线，1.在线) */
     private Integer deviceOnlineStatusStart;
 
@@ -166,1343 +184,1520 @@ public class DeviceQuery extends DeviceEntity {
     public DeviceQuery(){}
 
     /**
-     * 获取 开始 主键ID，主键，自增长
-     * @return idStart
-     */
+    * 获取 开始 主键ID，主键，自增长
+    * @return idStart
+    */
     public Long getIdStart(){
         return this.idStart;
     }
 
     /**
-     * 设置 开始 主键ID，主键，自增长
-     * @param idStart
-     */
+    * 设置 开始 主键ID，主键，自增长
+    * @param idStart
+    */
     public void setIdStart(Long idStart){
         this.idStart = idStart;
     }
 
     /**
-     * 获取 结束 主键ID，主键，自增长
-     * @return $idEnd
-     */
+    * 获取 结束 主键ID，主键，自增长
+    * @return $idEnd
+    */
     public Long getIdEnd(){
         return this.idEnd;
     }
 
     /**
-     * 设置 结束 主键ID，主键，自增长
-     * @param idEnd
-     */
+    * 设置 结束 主键ID，主键，自增长
+    * @param idEnd
+    */
     public void setIdEnd(Long idEnd){
         this.idEnd = idEnd;
     }
 
     /**
-     * 获取 增加 主键ID，主键，自增长
-     * @return idIncrement
-     */
+    * 获取 增加 主键ID，主键，自增长
+    * @return idIncrement
+    */
     public Long getIdIncrement(){
         return this.idIncrement;
     }
 
     /**
-     * 设置 增加 主键ID，主键，自增长
-     * @param idIncrement
-     */
+    * 设置 增加 主键ID，主键，自增长
+    * @param idIncrement
+    */
     public void setIdIncrement(Long idIncrement){
         this.idIncrement = idIncrement;
     }
 
     /**
-     * 获取 主键ID，主键，自增长
-     * @return idList
-     */
+    * 获取 主键ID，主键，自增长
+    * @return idList
+    */
     public List<Long> getIdList(){
         return this.idList;
     }
 
     /**
-     * 设置 主键ID，主键，自增长
-     * @param idList
-     */
+    * 设置 主键ID，主键，自增长
+    * @param idList
+    */
     public void setIdList(List<Long> idList){
         this.idList = idList;
     }
 
     /**
-     * 获取 设备名称
-     * @return deviceNameList
-     */
+    * 获取 设备名称
+    * @return deviceNameList
+    */
     public List<String> getDeviceNameList(){
         return this.deviceNameList;
     }
 
     /**
-     * 设置 设备名称
-     * @param deviceNameList
-     */
+    * 设置 设备名称
+    * @param deviceNameList
+    */
     public void setDeviceNameList(List<String> deviceNameList){
         this.deviceNameList = deviceNameList;
     }
     /**
-     * 获取 设备编码
-     * @return deviceCodeList
-     */
+    * 获取 设备编码
+    * @return deviceCodeList
+    */
     public List<String> getDeviceCodeList(){
         return this.deviceCodeList;
     }
 
     /**
-     * 设置 设备编码
-     * @param deviceCodeList
-     */
+    * 设置 设备编码
+    * @param deviceCodeList
+    */
     public void setDeviceCodeList(List<String> deviceCodeList){
         this.deviceCodeList = deviceCodeList;
     }
     /**
-     * 获取 开始 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
-     * @return deviceTypeStart
-     */
-    public Integer getDeviceTypeStart(){
-        return this.deviceTypeStart;
+    * 获取 站点编号（来源基础服务平台）
+    * @return siteCodeList
+    */
+    public List<String> getSiteCodeList(){
+        return this.siteCodeList;
     }
 
     /**
-     * 设置 开始 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
-     * @param deviceTypeStart
-     */
-    public void setDeviceTypeStart(Integer deviceTypeStart){
-        this.deviceTypeStart = deviceTypeStart;
+    * 设置 站点编号（来源基础服务平台）
+    * @param siteCodeList
+    */
+    public void setSiteCodeList(List<String> siteCodeList){
+        this.siteCodeList = siteCodeList;
+    }
+    /**
+    * 获取 设备的MAC地址
+    * @return deviceMacList
+    */
+    public List<String> getDeviceMacList(){
+        return this.deviceMacList;
     }
 
     /**
-     * 获取 结束 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
-     * @return $deviceTypeEnd
-     */
-    public Integer getDeviceTypeEnd(){
-        return this.deviceTypeEnd;
+    * 设置 设备的MAC地址
+    * @param deviceMacList
+    */
+    public void setDeviceMacList(List<String> deviceMacList){
+        this.deviceMacList = deviceMacList;
+    }
+    /**
+    * 获取 开始 平台系统Id
+    * @return platformIdStart
+    */
+    public Long getPlatformIdStart(){
+        return this.platformIdStart;
     }
 
     /**
-     * 设置 结束 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
-     * @param deviceTypeEnd
-     */
-    public void setDeviceTypeEnd(Integer deviceTypeEnd){
-        this.deviceTypeEnd = deviceTypeEnd;
+    * 设置 开始 平台系统Id
+    * @param platformIdStart
+    */
+    public void setPlatformIdStart(Long platformIdStart){
+        this.platformIdStart = platformIdStart;
     }
 
     /**
-     * 获取 增加 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
-     * @return deviceTypeIncrement
-     */
-    public Integer getDeviceTypeIncrement(){
-        return this.deviceTypeIncrement;
+    * 获取 结束 平台系统Id
+    * @return $platformIdEnd
+    */
+    public Long getPlatformIdEnd(){
+        return this.platformIdEnd;
     }
 
     /**
-     * 设置 增加 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
-     * @param deviceTypeIncrement
-     */
-    public void setDeviceTypeIncrement(Integer deviceTypeIncrement){
-        this.deviceTypeIncrement = deviceTypeIncrement;
+    * 设置 结束 平台系统Id
+    * @param platformIdEnd
+    */
+    public void setPlatformIdEnd(Long platformIdEnd){
+        this.platformIdEnd = platformIdEnd;
     }
 
     /**
-     * 获取 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
-     * @return deviceTypeList
-     */
-    public List<Integer> getDeviceTypeList(){
-        return this.deviceTypeList;
+    * 获取 增加 平台系统Id
+    * @return platformIdIncrement
+    */
+    public Long getPlatformIdIncrement(){
+        return this.platformIdIncrement;
     }
 
     /**
-     * 设置 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
-     * @param deviceTypeList
-     */
-    public void setDeviceTypeList(List<Integer> deviceTypeList){
-        this.deviceTypeList = deviceTypeList;
+    * 设置 增加 平台系统Id
+    * @param platformIdIncrement
+    */
+    public void setPlatformIdIncrement(Long platformIdIncrement){
+        this.platformIdIncrement = platformIdIncrement;
     }
 
     /**
-     * 获取 设备的MAC地址
-     * @return deviceMacList
-     */
-    public List<String> getDeviceMacList(){
-        return this.deviceMacList;
+    * 获取 平台系统Id
+    * @return platformIdList
+    */
+    public List<Long> getPlatformIdList(){
+        return this.platformIdList;
     }
 
     /**
-     * 设置 设备的MAC地址
-     * @param deviceMacList
-     */
-    public void setDeviceMacList(List<String> deviceMacList){
-        this.deviceMacList = deviceMacList;
+    * 设置 平台系统Id
+    * @param platformIdList
+    */
+    public void setPlatformIdList(List<Long> platformIdList){
+        this.platformIdList = platformIdList;
     }
+
     /**
-     * 获取 设备访问ip
-     * @return ipList
-     */
-    public List<String> getIpList(){
-        return this.ipList;
+    * 获取 平台系统名称
+    * @return platformNameList
+    */
+    public List<String> getPlatformNameList(){
+        return this.platformNameList;
     }
 
     /**
-     * 设置 设备访问ip
-     * @param ipList
-     */
-    public void setIpList(List<String> ipList){
-        this.ipList = ipList;
+    * 设置 平台系统名称
+    * @param platformNameList
+    */
+    public void setPlatformNameList(List<String> platformNameList){
+        this.platformNameList = platformNameList;
     }
     /**
-     * 获取 中心设备编码
-     * @return centernumList
-     */
-    public List<String> getCenternumList(){
-        return this.centernumList;
+    * 获取 开始 产品Id
+    * @return productIdStart
+    */
+    public Long getProductIdStart(){
+        return this.productIdStart;
     }
 
     /**
-     * 设置 中心设备编码
-     * @param centernumList
-     */
-    public void setCenternumList(List<String> centernumList){
-        this.centernumList = centernumList;
+    * 设置 开始 产品Id
+    * @param productIdStart
+    */
+    public void setProductIdStart(Long productIdStart){
+        this.productIdStart = productIdStart;
     }
+
     /**
-     * 获取 端口
-     * @return portList
-     */
-    public List<String> getPortList(){
-        return this.portList;
+    * 获取 结束 产品Id
+    * @return $productIdEnd
+    */
+    public Long getProductIdEnd(){
+        return this.productIdEnd;
     }
 
     /**
-     * 设置 端口
-     * @param portList
-     */
-    public void setPortList(List<String> portList){
-        this.portList = portList;
+    * 设置 结束 产品Id
+    * @param productIdEnd
+    */
+    public void setProductIdEnd(Long productIdEnd){
+        this.productIdEnd = productIdEnd;
+    }
+
+    /**
+    * 获取 增加 产品Id
+    * @return productIdIncrement
+    */
+    public Long getProductIdIncrement(){
+        return this.productIdIncrement;
     }
+
     /**
-     * 获取 站点编号
-     * @return siteNumList
-     */
-    public List<String> getSiteNumList(){
-        return this.siteNumList;
+    * 设置 增加 产品Id
+    * @param productIdIncrement
+    */
+    public void setProductIdIncrement(Long productIdIncrement){
+        this.productIdIncrement = productIdIncrement;
     }
 
     /**
-     * 设置 站点编号
-     * @param siteNumList
-     */
-    public void setSiteNumList(List<String> siteNumList){
-        this.siteNumList = siteNumList;
+    * 获取 产品Id
+    * @return productIdList
+    */
+    public List<Long> getProductIdList(){
+        return this.productIdList;
     }
+
     /**
-     * 获取 开始 设备生产厂商ID
-     * @return deviceFirmIdStart
-     */
+    * 设置 产品Id
+    * @param productIdList
+    */
+    public void setProductIdList(List<Long> productIdList){
+        this.productIdList = productIdList;
+    }
+
+    /**
+    * 获取 产品Id
+    * @return productNameList
+    */
+    public List<String> getProductNameList(){
+        return this.productNameList;
+    }
+
+    /**
+    * 设置 产品Id
+    * @param productNameList
+    */
+    public void setProductNameList(List<String> productNameList){
+        this.productNameList = productNameList;
+    }
+    /**
+    * 获取 开始 设备生产厂商ID
+    * @return deviceFirmIdStart
+    */
     public Long getDeviceFirmIdStart(){
         return this.deviceFirmIdStart;
     }
 
     /**
-     * 设置 开始 设备生产厂商ID
-     * @param deviceFirmIdStart
-     */
+    * 设置 开始 设备生产厂商ID
+    * @param deviceFirmIdStart
+    */
     public void setDeviceFirmIdStart(Long deviceFirmIdStart){
         this.deviceFirmIdStart = deviceFirmIdStart;
     }
 
     /**
-     * 获取 结束 设备生产厂商ID
-     * @return $deviceFirmIdEnd
-     */
+    * 获取 结束 设备生产厂商ID
+    * @return $deviceFirmIdEnd
+    */
     public Long getDeviceFirmIdEnd(){
         return this.deviceFirmIdEnd;
     }
 
     /**
-     * 设置 结束 设备生产厂商ID
-     * @param deviceFirmIdEnd
-     */
+    * 设置 结束 设备生产厂商ID
+    * @param deviceFirmIdEnd
+    */
     public void setDeviceFirmIdEnd(Long deviceFirmIdEnd){
         this.deviceFirmIdEnd = deviceFirmIdEnd;
     }
 
     /**
-     * 获取 增加 设备生产厂商ID
-     * @return deviceFirmIdIncrement
-     */
+    * 获取 增加 设备生产厂商ID
+    * @return deviceFirmIdIncrement
+    */
     public Long getDeviceFirmIdIncrement(){
         return this.deviceFirmIdIncrement;
     }
 
     /**
-     * 设置 增加 设备生产厂商ID
-     * @param deviceFirmIdIncrement
-     */
+    * 设置 增加 设备生产厂商ID
+    * @param deviceFirmIdIncrement
+    */
     public void setDeviceFirmIdIncrement(Long deviceFirmIdIncrement){
         this.deviceFirmIdIncrement = deviceFirmIdIncrement;
     }
 
     /**
-     * 获取 设备生产厂商ID
-     * @return deviceFirmIdList
-     */
+    * 获取 设备生产厂商ID
+    * @return deviceFirmIdList
+    */
     public List<Long> getDeviceFirmIdList(){
         return this.deviceFirmIdList;
     }
 
     /**
-     * 设置 设备生产厂商ID
-     * @param deviceFirmIdList
-     */
+    * 设置 设备生产厂商ID
+    * @param deviceFirmIdList
+    */
     public void setDeviceFirmIdList(List<Long> deviceFirmIdList){
         this.deviceFirmIdList = deviceFirmIdList;
     }
 
     /**
-     * 获取 设备生产厂商名称
-     * @return deviceFirmnameList
-     */
+    * 获取 设备生产厂商名称
+    * @return deviceFirmnameList
+    */
     public List<String> getDeviceFirmnameList(){
         return this.deviceFirmnameList;
     }
 
     /**
-     * 设置 设备生产厂商名称
-     * @param deviceFirmnameList
-     */
+    * 设置 设备生产厂商名称
+    * @param deviceFirmnameList
+    */
     public void setDeviceFirmnameList(List<String> deviceFirmnameList){
         this.deviceFirmnameList = deviceFirmnameList;
     }
     /**
-     * 获取 开始 在线状态 (0.离线，1.在线)
-     * @return deviceOnlineStatusStart
-     */
+    * 获取 设备访问ip
+    * @return ipList
+    */
+    public List<String> getIpList(){
+        return this.ipList;
+    }
+
+    /**
+    * 设置 设备访问ip
+    * @param ipList
+    */
+    public void setIpList(List<String> ipList){
+        this.ipList = ipList;
+    }
+    /**
+    * 获取 中心设备编码
+    * @return centernumList
+    */
+    public List<String> getCenternumList(){
+        return this.centernumList;
+    }
+
+    /**
+    * 设置 中心设备编码
+    * @param centernumList
+    */
+    public void setCenternumList(List<String> centernumList){
+        this.centernumList = centernumList;
+    }
+    /**
+    * 获取 端口
+    * @return portList
+    */
+    public List<String> getPortList(){
+        return this.portList;
+    }
+
+    /**
+    * 设置 端口
+    * @param portList
+    */
+    public void setPortList(List<String> portList){
+        this.portList = portList;
+    }
+    /**
+    * 获取 开始 在线状态 (0.离线，1.在线)
+    * @return deviceOnlineStatusStart
+    */
     public Integer getDeviceOnlineStatusStart(){
         return this.deviceOnlineStatusStart;
     }
 
     /**
-     * 设置 开始 在线状态 (0.离线，1.在线)
-     * @param deviceOnlineStatusStart
-     */
+    * 设置 开始 在线状态 (0.离线，1.在线)
+    * @param deviceOnlineStatusStart
+    */
     public void setDeviceOnlineStatusStart(Integer deviceOnlineStatusStart){
         this.deviceOnlineStatusStart = deviceOnlineStatusStart;
     }
 
     /**
-     * 获取 结束 在线状态 (0.离线，1.在线)
-     * @return $deviceOnlineStatusEnd
-     */
+    * 获取 结束 在线状态 (0.离线，1.在线)
+    * @return $deviceOnlineStatusEnd
+    */
     public Integer getDeviceOnlineStatusEnd(){
         return this.deviceOnlineStatusEnd;
     }
 
     /**
-     * 设置 结束 在线状态 (0.离线，1.在线)
-     * @param deviceOnlineStatusEnd
-     */
+    * 设置 结束 在线状态 (0.离线，1.在线)
+    * @param deviceOnlineStatusEnd
+    */
     public void setDeviceOnlineStatusEnd(Integer deviceOnlineStatusEnd){
         this.deviceOnlineStatusEnd = deviceOnlineStatusEnd;
     }
 
     /**
-     * 获取 增加 在线状态 (0.离线，1.在线)
-     * @return deviceOnlineStatusIncrement
-     */
+    * 获取 增加 在线状态 (0.离线，1.在线)
+    * @return deviceOnlineStatusIncrement
+    */
     public Integer getDeviceOnlineStatusIncrement(){
         return this.deviceOnlineStatusIncrement;
     }
 
     /**
-     * 设置 增加 在线状态 (0.离线，1.在线)
-     * @param deviceOnlineStatusIncrement
-     */
+    * 设置 增加 在线状态 (0.离线，1.在线)
+    * @param deviceOnlineStatusIncrement
+    */
     public void setDeviceOnlineStatusIncrement(Integer deviceOnlineStatusIncrement){
         this.deviceOnlineStatusIncrement = deviceOnlineStatusIncrement;
     }
 
     /**
-     * 获取 在线状态 (0.离线，1.在线)
-     * @return deviceOnlineStatusList
-     */
+    * 获取 在线状态 (0.离线，1.在线)
+    * @return deviceOnlineStatusList
+    */
     public List<Integer> getDeviceOnlineStatusList(){
         return this.deviceOnlineStatusList;
     }
 
     /**
-     * 设置 在线状态 (0.离线，1.在线)
-     * @param deviceOnlineStatusList
-     */
+    * 设置 在线状态 (0.离线，1.在线)
+    * @param deviceOnlineStatusList
+    */
     public void setDeviceOnlineStatusList(List<Integer> deviceOnlineStatusList){
         this.deviceOnlineStatusList = deviceOnlineStatusList;
     }
 
     /**
-     * 获取 开始 启用状态 (0.停止，1.启用)
-     * @return statusStart
-     */
+    * 获取 开始 启用状态 (0.停止，1.启用)
+    * @return statusStart
+    */
     public Integer getStatusStart(){
         return this.statusStart;
     }
 
     /**
-     * 设置 开始 启用状态 (0.停止，1.启用)
-     * @param statusStart
-     */
+    * 设置 开始 启用状态 (0.停止，1.启用)
+    * @param statusStart
+    */
     public void setStatusStart(Integer statusStart){
         this.statusStart = statusStart;
     }
 
     /**
-     * 获取 结束 启用状态 (0.停止，1.启用)
-     * @return $statusEnd
-     */
+    * 获取 结束 启用状态 (0.停止，1.启用)
+    * @return $statusEnd
+    */
     public Integer getStatusEnd(){
         return this.statusEnd;
     }
 
     /**
-     * 设置 结束 启用状态 (0.停止，1.启用)
-     * @param statusEnd
-     */
+    * 设置 结束 启用状态 (0.停止，1.启用)
+    * @param statusEnd
+    */
     public void setStatusEnd(Integer statusEnd){
         this.statusEnd = statusEnd;
     }
 
     /**
-     * 获取 增加 启用状态 (0.停止，1.启用)
-     * @return statusIncrement
-     */
+    * 获取 增加 启用状态 (0.停止，1.启用)
+    * @return statusIncrement
+    */
     public Integer getStatusIncrement(){
         return this.statusIncrement;
     }
 
     /**
-     * 设置 增加 启用状态 (0.停止，1.启用)
-     * @param statusIncrement
-     */
+    * 设置 增加 启用状态 (0.停止，1.启用)
+    * @param statusIncrement
+    */
     public void setStatusIncrement(Integer statusIncrement){
         this.statusIncrement = statusIncrement;
     }
 
     /**
-     * 获取 启用状态 (0.停止，1.启用)
-     * @return statusList
-     */
+    * 获取 启用状态 (0.停止，1.启用)
+    * @return statusList
+    */
     public List<Integer> getStatusList(){
         return this.statusList;
     }
 
     /**
-     * 设置 启用状态 (0.停止，1.启用)
-     * @param statusList
-     */
+    * 设置 启用状态 (0.停止，1.启用)
+    * @param statusList
+    */
     public void setStatusList(List<Integer> statusList){
         this.statusList = statusList;
     }
 
     /**
-     * 获取 开始 激活状态 (0.未激活，1.已激活)
-     * @return activeStart
-     */
+    * 获取 开始 激活状态 (0.未激活，1.已激活)
+    * @return activeStart
+    */
     public Integer getActiveStart(){
         return this.activeStart;
     }
 
     /**
-     * 设置 开始 激活状态 (0.未激活，1.已激活)
-     * @param activeStart
-     */
+    * 设置 开始 激活状态 (0.未激活，1.已激活)
+    * @param activeStart
+    */
     public void setActiveStart(Integer activeStart){
         this.activeStart = activeStart;
     }
 
     /**
-     * 获取 结束 激活状态 (0.未激活，1.已激活)
-     * @return $activeEnd
-     */
+    * 获取 结束 激活状态 (0.未激活，1.已激活)
+    * @return $activeEnd
+    */
     public Integer getActiveEnd(){
         return this.activeEnd;
     }
 
     /**
-     * 设置 结束 激活状态 (0.未激活，1.已激活)
-     * @param activeEnd
-     */
+    * 设置 结束 激活状态 (0.未激活，1.已激活)
+    * @param activeEnd
+    */
     public void setActiveEnd(Integer activeEnd){
         this.activeEnd = activeEnd;
     }
 
     /**
-     * 获取 增加 激活状态 (0.未激活，1.已激活)
-     * @return activeIncrement
-     */
+    * 获取 增加 激活状态 (0.未激活，1.已激活)
+    * @return activeIncrement
+    */
     public Integer getActiveIncrement(){
         return this.activeIncrement;
     }
 
     /**
-     * 设置 增加 激活状态 (0.未激活，1.已激活)
-     * @param activeIncrement
-     */
+    * 设置 增加 激活状态 (0.未激活，1.已激活)
+    * @param activeIncrement
+    */
     public void setActiveIncrement(Integer activeIncrement){
         this.activeIncrement = activeIncrement;
     }
 
     /**
-     * 获取 激活状态 (0.未激活，1.已激活)
-     * @return activeList
-     */
+    * 获取 激活状态 (0.未激活，1.已激活)
+    * @return activeList
+    */
     public List<Integer> getActiveList(){
         return this.activeList;
     }
 
     /**
-     * 设置 激活状态 (0.未激活，1.已激活)
-     * @param activeList
-     */
+    * 设置 激活状态 (0.未激活，1.已激活)
+    * @param activeList
+    */
     public void setActiveList(List<Integer> activeList){
         this.activeList = activeList;
     }
 
     /**
-     * 获取 备注
-     * @return deviceRemarkList
-     */
+    * 获取 备注
+    * @return deviceRemarkList
+    */
     public List<String> getDeviceRemarkList(){
         return this.deviceRemarkList;
     }
 
     /**
-     * 设置 备注
-     * @param deviceRemarkList
-     */
+    * 设置 备注
+    * @param deviceRemarkList
+    */
     public void setDeviceRemarkList(List<String> deviceRemarkList){
         this.deviceRemarkList = deviceRemarkList;
     }
     /**
-     * 获取 开始 最近上线时间
-     * @return onlineTimeStart
-     */
+    * 获取 开始 最近上线时间
+    * @return onlineTimeStart
+    */
     public String getOnlineTimeStart(){
         return this.onlineTimeStart;
     }
 
     /**
-     * 设置 开始 最近上线时间
-     * @param onlineTimeStart
-     */
+    * 设置 开始 最近上线时间
+    * @param onlineTimeStart
+    */
     public void setOnlineTimeStart(String onlineTimeStart){
         this.onlineTimeStart = onlineTimeStart;
     }
 
     /**
-     * 获取 结束 最近上线时间
-     * @return onlineTimeEnd
-     */
+    * 获取 结束 最近上线时间
+    * @return onlineTimeEnd
+    */
     public String getOnlineTimeEnd(){
         return this.onlineTimeEnd;
     }
 
     /**
-     * 设置 结束 最近上线时间
-     * @param onlineTimeEnd
-     */
+    * 设置 结束 最近上线时间
+    * @param onlineTimeEnd
+    */
     public void setOnlineTimeEnd(String onlineTimeEnd){
         this.onlineTimeEnd = onlineTimeEnd;
     }
 
     /**
-     * 获取 开始 最近离线时间
-     * @return offlineTimeStart
-     */
+    * 获取 开始 最近离线时间
+    * @return offlineTimeStart
+    */
     public String getOfflineTimeStart(){
         return this.offlineTimeStart;
     }
 
     /**
-     * 设置 开始 最近离线时间
-     * @param offlineTimeStart
-     */
+    * 设置 开始 最近离线时间
+    * @param offlineTimeStart
+    */
     public void setOfflineTimeStart(String offlineTimeStart){
         this.offlineTimeStart = offlineTimeStart;
     }
 
     /**
-     * 获取 结束 最近离线时间
-     * @return offlineTimeEnd
-     */
+    * 获取 结束 最近离线时间
+    * @return offlineTimeEnd
+    */
     public String getOfflineTimeEnd(){
         return this.offlineTimeEnd;
     }
 
     /**
-     * 设置 结束 最近离线时间
-     * @param offlineTimeEnd
-     */
+    * 设置 结束 最近离线时间
+    * @param offlineTimeEnd
+    */
     public void setOfflineTimeEnd(String offlineTimeEnd){
         this.offlineTimeEnd = offlineTimeEnd;
     }
 
     /**
-     * 获取 开始 创建用户
-     * @return createUserIdStart
-     */
+    * 获取 开始 创建用户
+    * @return createUserIdStart
+    */
     public Long getCreateUserIdStart(){
         return this.createUserIdStart;
     }
 
     /**
-     * 设置 开始 创建用户
-     * @param createUserIdStart
-     */
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
     public void setCreateUserIdStart(Long createUserIdStart){
         this.createUserIdStart = createUserIdStart;
     }
 
     /**
-     * 获取 结束 创建用户
-     * @return $createUserIdEnd
-     */
+    * 获取 结束 创建用户
+    * @return $createUserIdEnd
+    */
     public Long getCreateUserIdEnd(){
         return this.createUserIdEnd;
     }
 
     /**
-     * 设置 结束 创建用户
-     * @param createUserIdEnd
-     */
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
     public void setCreateUserIdEnd(Long createUserIdEnd){
         this.createUserIdEnd = createUserIdEnd;
     }
 
     /**
-     * 获取 增加 创建用户
-     * @return createUserIdIncrement
-     */
+    * 获取 增加 创建用户
+    * @return createUserIdIncrement
+    */
     public Long getCreateUserIdIncrement(){
         return this.createUserIdIncrement;
     }
 
     /**
-     * 设置 增加 创建用户
-     * @param createUserIdIncrement
-     */
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
     public void setCreateUserIdIncrement(Long createUserIdIncrement){
         this.createUserIdIncrement = createUserIdIncrement;
     }
 
     /**
-     * 获取 创建用户
-     * @return createUserIdList
-     */
+    * 获取 创建用户
+    * @return createUserIdList
+    */
     public List<Long> getCreateUserIdList(){
         return this.createUserIdList;
     }
 
     /**
-     * 设置 创建用户
-     * @param createUserIdList
-     */
+    * 设置 创建用户
+    * @param createUserIdList
+    */
     public void setCreateUserIdList(List<Long> createUserIdList){
         this.createUserIdList = createUserIdList;
     }
 
     /**
-     * 获取 开始 创建时间
-     * @return createTimeStart
-     */
+    * 获取 开始 创建时间
+    * @return createTimeStart
+    */
     public String getCreateTimeStart(){
         return this.createTimeStart;
     }
 
     /**
-     * 设置 开始 创建时间
-     * @param createTimeStart
-     */
+    * 设置 开始 创建时间
+    * @param createTimeStart
+    */
     public void setCreateTimeStart(String createTimeStart){
         this.createTimeStart = createTimeStart;
     }
 
     /**
-     * 获取 结束 创建时间
-     * @return createTimeEnd
-     */
+    * 获取 结束 创建时间
+    * @return createTimeEnd
+    */
     public String getCreateTimeEnd(){
         return this.createTimeEnd;
     }
 
     /**
-     * 设置 结束 创建时间
-     * @param createTimeEnd
-     */
+    * 设置 结束 创建时间
+    * @param createTimeEnd
+    */
     public void setCreateTimeEnd(String createTimeEnd){
         this.createTimeEnd = createTimeEnd;
     }
 
     /**
-     * 获取 开始 更新用户
-     * @return updateUserIdStart
-     */
+    * 获取 开始 更新用户
+    * @return updateUserIdStart
+    */
     public Long getUpdateUserIdStart(){
         return this.updateUserIdStart;
     }
 
     /**
-     * 设置 开始 更新用户
-     * @param updateUserIdStart
-     */
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
     public void setUpdateUserIdStart(Long updateUserIdStart){
         this.updateUserIdStart = updateUserIdStart;
     }
 
     /**
-     * 获取 结束 更新用户
-     * @return $updateUserIdEnd
-     */
+    * 获取 结束 更新用户
+    * @return $updateUserIdEnd
+    */
     public Long getUpdateUserIdEnd(){
         return this.updateUserIdEnd;
     }
 
     /**
-     * 设置 结束 更新用户
-     * @param updateUserIdEnd
-     */
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
     public void setUpdateUserIdEnd(Long updateUserIdEnd){
         this.updateUserIdEnd = updateUserIdEnd;
     }
 
     /**
-     * 获取 增加 更新用户
-     * @return updateUserIdIncrement
-     */
+    * 获取 增加 更新用户
+    * @return updateUserIdIncrement
+    */
     public Long getUpdateUserIdIncrement(){
         return this.updateUserIdIncrement;
     }
 
     /**
-     * 设置 增加 更新用户
-     * @param updateUserIdIncrement
-     */
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
     public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
         this.updateUserIdIncrement = updateUserIdIncrement;
     }
 
     /**
-     * 获取 更新用户
-     * @return updateUserIdList
-     */
+    * 获取 更新用户
+    * @return updateUserIdList
+    */
     public List<Long> getUpdateUserIdList(){
         return this.updateUserIdList;
     }
 
     /**
-     * 设置 更新用户
-     * @param updateUserIdList
-     */
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
     public void setUpdateUserIdList(List<Long> updateUserIdList){
         this.updateUserIdList = updateUserIdList;
     }
 
     /**
-     * 获取 开始 更新时间
-     * @return updateTimeStart
-     */
+    * 获取 开始 更新时间
+    * @return updateTimeStart
+    */
     public String getUpdateTimeStart(){
         return this.updateTimeStart;
     }
 
     /**
-     * 设置 开始 更新时间
-     * @param updateTimeStart
-     */
+    * 设置 开始 更新时间
+    * @param updateTimeStart
+    */
     public void setUpdateTimeStart(String updateTimeStart){
         this.updateTimeStart = updateTimeStart;
     }
 
     /**
-     * 获取 结束 更新时间
-     * @return updateTimeEnd
-     */
+    * 获取 结束 更新时间
+    * @return updateTimeEnd
+    */
     public String getUpdateTimeEnd(){
         return this.updateTimeEnd;
     }
 
     /**
-     * 设置 结束 更新时间
-     * @param updateTimeEnd
-     */
+    * 设置 结束 更新时间
+    * @param updateTimeEnd
+    */
     public void setUpdateTimeEnd(String updateTimeEnd){
         this.updateTimeEnd = updateTimeEnd;
     }
 
     /**
-     * 设置  主键ID，主键，自增长
-     * @param id
-     */
+    * 设置  主键ID，主键，自增长
+    * @param id
+    */
     public DeviceQuery id(Long id){
-        setId(id);
-        return this;
-    }
-
-    /**
-     * 设置 开始 主键ID，主键，自增长
-     * @param idStart
-     */
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 主键ID，主键，自增长
+    * @param idStart
+    */
     public DeviceQuery idStart(Long idStart){
-        this.idStart = idStart;
-        return this;
+		this.idStart = idStart;
+		return this;
     }
 
     /**
-     * 设置 结束 主键ID，主键，自增长
-     * @param idEnd
-     */
+    * 设置 结束 主键ID，主键，自增长
+    * @param idEnd
+    */
     public DeviceQuery idEnd(Long idEnd){
-        this.idEnd = idEnd;
-        return this;
+		this.idEnd = idEnd;
+		return this;
     }
 
     /**
-     * 设置 增加 主键ID，主键，自增长
-     * @param idIncrement
-     */
+    * 设置 增加 主键ID，主键，自增长
+    * @param idIncrement
+    */
     public DeviceQuery idIncrement(Long idIncrement){
-        this.idIncrement = idIncrement;
-        return this;
+		this.idIncrement = idIncrement;
+		return this;
     }
 
     /**
-     * 设置 主键ID，主键，自增长
-     * @param idList
-     */
+    * 设置 主键ID，主键，自增长
+    * @param idList
+    */
     public DeviceQuery idList(List<Long> idList){
         this.idList = idList;
-        return this;
-    }
+		return this;
+        }
 
 
-    /**
-     * 设置 设备名称
-     * @param deviceName
-     */
+	/**
+    * 设置 设备名称
+    * @param deviceName
+    */
     public DeviceQuery deviceName(String deviceName){
         setDeviceName(deviceName);
-        return this;
+		return this;
     }
 
     /**
-     * 设置 设备名称
-     * @param deviceNameList
-     */
+    * 设置 设备名称
+    * @param deviceNameList
+    */
     public DeviceQuery deviceNameList(List<String> deviceNameList){
         this.deviceNameList = deviceNameList;
-        return this;
+		return this;
     }
 
 
-    /**
-     * 设置 设备编码
-     * @param deviceCode
-     */
+	/**
+    * 设置 设备编码
+    * @param deviceCode
+    */
     public DeviceQuery deviceCode(String deviceCode){
         setDeviceCode(deviceCode);
-        return this;
+		return this;
     }
 
     /**
-     * 设置 设备编码
-     * @param deviceCodeList
-     */
+    * 设置 设备编码
+    * @param deviceCodeList
+    */
     public DeviceQuery deviceCodeList(List<String> deviceCodeList){
         this.deviceCodeList = deviceCodeList;
-        return this;
+		return this;
     }
 
-    /**
-     * 设置  设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
-     * @param deviceType
-     */
-    public DeviceQuery deviceType(Integer deviceType){
-        setDeviceType(deviceType);
-        return this;
-    }
 
-    /**
-     * 设置 开始 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
-     * @param deviceTypeStart
-     */
-    public DeviceQuery deviceTypeStart(Integer deviceTypeStart){
-        this.deviceTypeStart = deviceTypeStart;
-        return this;
+	/**
+    * 设置 站点编号（来源基础服务平台）
+    * @param siteCode
+    */
+    public DeviceQuery siteCode(String siteCode){
+        setSiteCode(siteCode);
+		return this;
     }
 
     /**
-     * 设置 结束 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
-     * @param deviceTypeEnd
-     */
-    public DeviceQuery deviceTypeEnd(Integer deviceTypeEnd){
-        this.deviceTypeEnd = deviceTypeEnd;
-        return this;
+    * 设置 站点编号（来源基础服务平台）
+    * @param siteCodeList
+    */
+    public DeviceQuery siteCodeList(List<String> siteCodeList){
+        this.siteCodeList = siteCodeList;
+		return this;
     }
 
-    /**
-     * 设置 增加 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
-     * @param deviceTypeIncrement
-     */
-    public DeviceQuery deviceTypeIncrement(Integer deviceTypeIncrement){
-        this.deviceTypeIncrement = deviceTypeIncrement;
-        return this;
-    }
 
-    /**
-     * 设置 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
-     * @param deviceTypeList
-     */
-    public DeviceQuery deviceTypeList(List<Integer> deviceTypeList){
-        this.deviceTypeList = deviceTypeList;
-        return this;
-    }
-
-
-    /**
-     * 设置 设备的MAC地址
-     * @param deviceMac
-     */
+	/**
+    * 设置 设备的MAC地址
+    * @param deviceMac
+    */
     public DeviceQuery deviceMac(String deviceMac){
         setDeviceMac(deviceMac);
-        return this;
+		return this;
     }
 
     /**
-     * 设置 设备的MAC地址
-     * @param deviceMacList
-     */
+    * 设置 设备的MAC地址
+    * @param deviceMacList
+    */
     public DeviceQuery deviceMacList(List<String> deviceMacList){
         this.deviceMacList = deviceMacList;
-        return this;
+		return this;
     }
 
-
     /**
-     * 设置 设备访问ip
-     * @param ip
-     */
-    public DeviceQuery ip(String ip){
-        setIp(ip);
-        return this;
+    * 设置  平台系统Id
+    * @param platformId
+    */
+    public DeviceQuery platformId(Long platformId){
+	    setPlatformId(platformId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 平台系统Id
+    * @param platformIdStart
+    */
+    public DeviceQuery platformIdStart(Long platformIdStart){
+		this.platformIdStart = platformIdStart;
+		return this;
     }
 
     /**
-     * 设置 设备访问ip
-     * @param ipList
-     */
-    public DeviceQuery ipList(List<String> ipList){
-        this.ipList = ipList;
-        return this;
+    * 设置 结束 平台系统Id
+    * @param platformIdEnd
+    */
+    public DeviceQuery platformIdEnd(Long platformIdEnd){
+		this.platformIdEnd = platformIdEnd;
+		return this;
     }
 
-
     /**
-     * 设置 中心设备编码
-     * @param centernum
-     */
-    public DeviceQuery centernum(String centernum){
-        setCenternum(centernum);
-        return this;
+    * 设置 增加 平台系统Id
+    * @param platformIdIncrement
+    */
+    public DeviceQuery platformIdIncrement(Long platformIdIncrement){
+		this.platformIdIncrement = platformIdIncrement;
+		return this;
     }
 
     /**
-     * 设置 中心设备编码
-     * @param centernumList
-     */
-    public DeviceQuery centernumList(List<String> centernumList){
-        this.centernumList = centernumList;
-        return this;
-    }
+    * 设置 平台系统Id
+    * @param platformIdList
+    */
+    public DeviceQuery platformIdList(List<Long> platformIdList){
+        this.platformIdList = platformIdList;
+		return this;
+        }
 
 
+	/**
+    * 设置 平台系统名称
+    * @param platformName
+    */
+    public DeviceQuery platformName(String platformName){
+        setPlatformName(platformName);
+		return this;
+    }
+
     /**
-     * 设置 端口
-     * @param port
-     */
-    public DeviceQuery port(String port){
-        setPort(port);
-        return this;
+    * 设置 平台系统名称
+    * @param platformNameList
+    */
+    public DeviceQuery platformNameList(List<String> platformNameList){
+        this.platformNameList = platformNameList;
+		return this;
     }
 
     /**
-     * 设置 端口
-     * @param portList
-     */
-    public DeviceQuery portList(List<String> portList){
-        this.portList = portList;
-        return this;
+    * 设置  产品Id
+    * @param productId
+    */
+    public DeviceQuery productId(Long productId){
+	    setProductId(productId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 产品Id
+    * @param productIdStart
+    */
+    public DeviceQuery productIdStart(Long productIdStart){
+		this.productIdStart = productIdStart;
+		return this;
     }
 
+    /**
+    * 设置 结束 产品Id
+    * @param productIdEnd
+    */
+    public DeviceQuery productIdEnd(Long productIdEnd){
+		this.productIdEnd = productIdEnd;
+		return this;
+    }
 
     /**
-     * 设置 站点编号
-     * @param siteNum
-     */
-    public DeviceQuery siteNum(String siteNum){
-        setSiteNum(siteNum);
-        return this;
+    * 设置 增加 产品Id
+    * @param productIdIncrement
+    */
+    public DeviceQuery productIdIncrement(Long productIdIncrement){
+		this.productIdIncrement = productIdIncrement;
+		return this;
     }
 
     /**
-     * 设置 站点编号
-     * @param siteNumList
-     */
-    public DeviceQuery siteNumList(List<String> siteNumList){
-        this.siteNumList = siteNumList;
-        return this;
+    * 设置 产品Id
+    * @param productIdList
+    */
+    public DeviceQuery productIdList(List<Long> productIdList){
+        this.productIdList = productIdList;
+		return this;
+        }
+
+
+	/**
+    * 设置 产品Id
+    * @param productName
+    */
+    public DeviceQuery productName(String productName){
+        setProductName(productName);
+		return this;
     }
 
     /**
-     * 设置  设备生产厂商ID
-     * @param deviceFirmId
-     */
-    public DeviceQuery deviceFirmId(Long deviceFirmId){
-        setDeviceFirmId(deviceFirmId);
-        return this;
+    * 设置 产品Id
+    * @param productNameList
+    */
+    public DeviceQuery productNameList(List<String> productNameList){
+        this.productNameList = productNameList;
+		return this;
     }
 
     /**
-     * 设置 开始 设备生产厂商ID
-     * @param deviceFirmIdStart
-     */
+    * 设置  设备生产厂商ID
+    * @param deviceFirmId
+    */
+    public DeviceQuery deviceFirmId(Long deviceFirmId){
+	    setDeviceFirmId(deviceFirmId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 设备生产厂商ID
+    * @param deviceFirmIdStart
+    */
     public DeviceQuery deviceFirmIdStart(Long deviceFirmIdStart){
-        this.deviceFirmIdStart = deviceFirmIdStart;
-        return this;
+		this.deviceFirmIdStart = deviceFirmIdStart;
+		return this;
     }
 
     /**
-     * 设置 结束 设备生产厂商ID
-     * @param deviceFirmIdEnd
-     */
+    * 设置 结束 设备生产厂商ID
+    * @param deviceFirmIdEnd
+    */
     public DeviceQuery deviceFirmIdEnd(Long deviceFirmIdEnd){
-        this.deviceFirmIdEnd = deviceFirmIdEnd;
-        return this;
+		this.deviceFirmIdEnd = deviceFirmIdEnd;
+		return this;
     }
 
     /**
-     * 设置 增加 设备生产厂商ID
-     * @param deviceFirmIdIncrement
-     */
+    * 设置 增加 设备生产厂商ID
+    * @param deviceFirmIdIncrement
+    */
     public DeviceQuery deviceFirmIdIncrement(Long deviceFirmIdIncrement){
-        this.deviceFirmIdIncrement = deviceFirmIdIncrement;
-        return this;
+		this.deviceFirmIdIncrement = deviceFirmIdIncrement;
+		return this;
     }
 
     /**
-     * 设置 设备生产厂商ID
-     * @param deviceFirmIdList
-     */
+    * 设置 设备生产厂商ID
+    * @param deviceFirmIdList
+    */
     public DeviceQuery deviceFirmIdList(List<Long> deviceFirmIdList){
         this.deviceFirmIdList = deviceFirmIdList;
-        return this;
-    }
+		return this;
+        }
 
 
-    /**
-     * 设置 设备生产厂商名称
-     * @param deviceFirmname
-     */
+	/**
+    * 设置 设备生产厂商名称
+    * @param deviceFirmname
+    */
     public DeviceQuery deviceFirmname(String deviceFirmname){
         setDeviceFirmname(deviceFirmname);
-        return this;
+		return this;
     }
 
     /**
-     * 设置 设备生产厂商名称
-     * @param deviceFirmnameList
-     */
+    * 设置 设备生产厂商名称
+    * @param deviceFirmnameList
+    */
     public DeviceQuery deviceFirmnameList(List<String> deviceFirmnameList){
         this.deviceFirmnameList = deviceFirmnameList;
-        return this;
+		return this;
+    }
+
+
+	/**
+    * 设置 设备访问ip
+    * @param ip
+    */
+    public DeviceQuery ip(String ip){
+        setIp(ip);
+		return this;
     }
 
     /**
-     * 设置  在线状态 (0.离线，1.在线)
-     * @param deviceOnlineStatus
-     */
-    public DeviceQuery deviceOnlineStatus(Integer deviceOnlineStatus){
-        setDeviceOnlineStatus(deviceOnlineStatus);
-        return this;
+    * 设置 设备访问ip
+    * @param ipList
+    */
+    public DeviceQuery ipList(List<String> ipList){
+        this.ipList = ipList;
+		return this;
+    }
+
+
+	/**
+    * 设置 中心设备编码
+    * @param centernum
+    */
+    public DeviceQuery centernum(String centernum){
+        setCenternum(centernum);
+		return this;
     }
 
     /**
-     * 设置 开始 在线状态 (0.离线，1.在线)
-     * @param deviceOnlineStatusStart
-     */
+    * 设置 中心设备编码
+    * @param centernumList
+    */
+    public DeviceQuery centernumList(List<String> centernumList){
+        this.centernumList = centernumList;
+		return this;
+    }
+
+
+	/**
+    * 设置 端口
+    * @param port
+    */
+    public DeviceQuery port(String port){
+        setPort(port);
+		return this;
+    }
+
+    /**
+    * 设置 端口
+    * @param portList
+    */
+    public DeviceQuery portList(List<String> portList){
+        this.portList = portList;
+		return this;
+    }
+
+    /**
+    * 设置  在线状态 (0.离线，1.在线)
+    * @param deviceOnlineStatus
+    */
+    public DeviceQuery deviceOnlineStatus(Integer deviceOnlineStatus){
+	    setDeviceOnlineStatus(deviceOnlineStatus);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 在线状态 (0.离线，1.在线)
+    * @param deviceOnlineStatusStart
+    */
     public DeviceQuery deviceOnlineStatusStart(Integer deviceOnlineStatusStart){
-        this.deviceOnlineStatusStart = deviceOnlineStatusStart;
-        return this;
+		this.deviceOnlineStatusStart = deviceOnlineStatusStart;
+		return this;
     }
 
     /**
-     * 设置 结束 在线状态 (0.离线，1.在线)
-     * @param deviceOnlineStatusEnd
-     */
+    * 设置 结束 在线状态 (0.离线，1.在线)
+    * @param deviceOnlineStatusEnd
+    */
     public DeviceQuery deviceOnlineStatusEnd(Integer deviceOnlineStatusEnd){
-        this.deviceOnlineStatusEnd = deviceOnlineStatusEnd;
-        return this;
+		this.deviceOnlineStatusEnd = deviceOnlineStatusEnd;
+		return this;
     }
 
     /**
-     * 设置 增加 在线状态 (0.离线，1.在线)
-     * @param deviceOnlineStatusIncrement
-     */
+    * 设置 增加 在线状态 (0.离线，1.在线)
+    * @param deviceOnlineStatusIncrement
+    */
     public DeviceQuery deviceOnlineStatusIncrement(Integer deviceOnlineStatusIncrement){
-        this.deviceOnlineStatusIncrement = deviceOnlineStatusIncrement;
-        return this;
+		this.deviceOnlineStatusIncrement = deviceOnlineStatusIncrement;
+		return this;
     }
 
     /**
-     * 设置 在线状态 (0.离线，1.在线)
-     * @param deviceOnlineStatusList
-     */
+    * 设置 在线状态 (0.离线，1.在线)
+    * @param deviceOnlineStatusList
+    */
     public DeviceQuery deviceOnlineStatusList(List<Integer> deviceOnlineStatusList){
         this.deviceOnlineStatusList = deviceOnlineStatusList;
-        return this;
-    }
+		return this;
+        }
 
     /**
-     * 设置  启用状态 (0.停止，1.启用)
-     * @param status
-     */
+    * 设置  启用状态 (0.停止，1.启用)
+    * @param status
+    */
     public DeviceQuery status(Integer status){
-        setStatus(status);
-        return this;
-    }
-
-    /**
-     * 设置 开始 启用状态 (0.停止，1.启用)
-     * @param statusStart
-     */
+	    setStatus(status);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 启用状态 (0.停止，1.启用)
+    * @param statusStart
+    */
     public DeviceQuery statusStart(Integer statusStart){
-        this.statusStart = statusStart;
-        return this;
+		this.statusStart = statusStart;
+		return this;
     }
 
     /**
-     * 设置 结束 启用状态 (0.停止，1.启用)
-     * @param statusEnd
-     */
+    * 设置 结束 启用状态 (0.停止，1.启用)
+    * @param statusEnd
+    */
     public DeviceQuery statusEnd(Integer statusEnd){
-        this.statusEnd = statusEnd;
-        return this;
+		this.statusEnd = statusEnd;
+		return this;
     }
 
     /**
-     * 设置 增加 启用状态 (0.停止，1.启用)
-     * @param statusIncrement
-     */
+    * 设置 增加 启用状态 (0.停止，1.启用)
+    * @param statusIncrement
+    */
     public DeviceQuery statusIncrement(Integer statusIncrement){
-        this.statusIncrement = statusIncrement;
-        return this;
+		this.statusIncrement = statusIncrement;
+		return this;
     }
 
     /**
-     * 设置 启用状态 (0.停止，1.启用)
-     * @param statusList
-     */
+    * 设置 启用状态 (0.停止，1.启用)
+    * @param statusList
+    */
     public DeviceQuery statusList(List<Integer> statusList){
         this.statusList = statusList;
-        return this;
-    }
+		return this;
+        }
 
     /**
-     * 设置  激活状态 (0.未激活，1.已激活)
-     * @param active
-     */
+    * 设置  激活状态 (0.未激活，1.已激活)
+    * @param active
+    */
     public DeviceQuery active(Integer active){
-        setActive(active);
-        return this;
-    }
-
-    /**
-     * 设置 开始 激活状态 (0.未激活，1.已激活)
-     * @param activeStart
-     */
+	    setActive(active);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 激活状态 (0.未激活，1.已激活)
+    * @param activeStart
+    */
     public DeviceQuery activeStart(Integer activeStart){
-        this.activeStart = activeStart;
-        return this;
+		this.activeStart = activeStart;
+		return this;
     }
 
     /**
-     * 设置 结束 激活状态 (0.未激活，1.已激活)
-     * @param activeEnd
-     */
+    * 设置 结束 激活状态 (0.未激活，1.已激活)
+    * @param activeEnd
+    */
     public DeviceQuery activeEnd(Integer activeEnd){
-        this.activeEnd = activeEnd;
-        return this;
+		this.activeEnd = activeEnd;
+		return this;
     }
 
     /**
-     * 设置 增加 激活状态 (0.未激活，1.已激活)
-     * @param activeIncrement
-     */
+    * 设置 增加 激活状态 (0.未激活，1.已激活)
+    * @param activeIncrement
+    */
     public DeviceQuery activeIncrement(Integer activeIncrement){
-        this.activeIncrement = activeIncrement;
-        return this;
+		this.activeIncrement = activeIncrement;
+		return this;
     }
 
     /**
-     * 设置 激活状态 (0.未激活，1.已激活)
-     * @param activeList
-     */
+    * 设置 激活状态 (0.未激活，1.已激活)
+    * @param activeList
+    */
     public DeviceQuery activeList(List<Integer> activeList){
         this.activeList = activeList;
-        return this;
-    }
+		return this;
+        }
 
 
-    /**
-     * 设置 备注
-     * @param deviceRemark
-     */
+	/**
+    * 设置 备注
+    * @param deviceRemark
+    */
     public DeviceQuery deviceRemark(String deviceRemark){
         setDeviceRemark(deviceRemark);
-        return this;
+		return this;
     }
 
     /**
-     * 设置 备注
-     * @param deviceRemarkList
-     */
+    * 设置 备注
+    * @param deviceRemarkList
+    */
     public DeviceQuery deviceRemarkList(List<String> deviceRemarkList){
         this.deviceRemarkList = deviceRemarkList;
-        return this;
+		return this;
     }
 
 
 
     /**
-     * 设置  创建用户
-     * @param createUserId
-     */
+    * 设置  创建用户
+    * @param createUserId
+    */
     public DeviceQuery createUserId(Long createUserId){
-        setCreateUserId(createUserId);
-        return this;
-    }
-
-    /**
-     * 设置 开始 创建用户
-     * @param createUserIdStart
-     */
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
     public DeviceQuery createUserIdStart(Long createUserIdStart){
-        this.createUserIdStart = createUserIdStart;
-        return this;
+		this.createUserIdStart = createUserIdStart;
+		return this;
     }
 
     /**
-     * 设置 结束 创建用户
-     * @param createUserIdEnd
-     */
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
     public DeviceQuery createUserIdEnd(Long createUserIdEnd){
-        this.createUserIdEnd = createUserIdEnd;
-        return this;
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
     }
 
     /**
-     * 设置 增加 创建用户
-     * @param createUserIdIncrement
-     */
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
     public DeviceQuery createUserIdIncrement(Long createUserIdIncrement){
-        this.createUserIdIncrement = createUserIdIncrement;
-        return this;
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
     }
 
     /**
-     * 设置 创建用户
-     * @param createUserIdList
-     */
+    * 设置 创建用户
+    * @param createUserIdList
+    */
     public DeviceQuery createUserIdList(List<Long> createUserIdList){
         this.createUserIdList = createUserIdList;
-        return this;
-    }
+		return this;
+        }
 
 
     /**
-     * 设置  更新用户
-     * @param updateUserId
-     */
+    * 设置  更新用户
+    * @param updateUserId
+    */
     public DeviceQuery updateUserId(Long updateUserId){
-        setUpdateUserId(updateUserId);
-        return this;
-    }
-
-    /**
-     * 设置 开始 更新用户
-     * @param updateUserIdStart
-     */
+	    setUpdateUserId(updateUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
     public DeviceQuery updateUserIdStart(Long updateUserIdStart){
-        this.updateUserIdStart = updateUserIdStart;
-        return this;
+		this.updateUserIdStart = updateUserIdStart;
+		return this;
     }
 
     /**
-     * 设置 结束 更新用户
-     * @param updateUserIdEnd
-     */
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
     public DeviceQuery updateUserIdEnd(Long updateUserIdEnd){
-        this.updateUserIdEnd = updateUserIdEnd;
-        return this;
+		this.updateUserIdEnd = updateUserIdEnd;
+		return this;
     }
 
     /**
-     * 设置 增加 更新用户
-     * @param updateUserIdIncrement
-     */
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
     public DeviceQuery updateUserIdIncrement(Long updateUserIdIncrement){
-        this.updateUserIdIncrement = updateUserIdIncrement;
-        return this;
+		this.updateUserIdIncrement = updateUserIdIncrement;
+		return this;
     }
 
     /**
-     * 设置 更新用户
-     * @param updateUserIdList
-     */
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
     public DeviceQuery updateUserIdList(List<Long> updateUserIdList){
         this.updateUserIdList = updateUserIdList;
-        return this;
-    }
+		return this;
+        }
 
 
     /**
-     * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-     * @return orConditionList
-     */
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
     public List<DeviceQuery> getOrConditionList(){
-        return this.orConditionList;
+    return this.orConditionList;
     }
 
     /**
-     * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-     * @param orConditionList
-     */
+    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @param orConditionList
+    */
     public void setOrConditionList(List<DeviceQuery> orConditionList){
         this.orConditionList = orConditionList;
     }
 
     /**
-     * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-     * @return andConditionList
-     */
+    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @return andConditionList
+    */
     public List<DeviceQuery> getAndConditionList(){
         return this.andConditionList;
     }
 
     /**
-     * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-     * @param andConditionList
-     */
+    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @param andConditionList
+    */
     public void setAndConditionList(List<DeviceQuery> andConditionList){
         this.andConditionList = andConditionList;
     }

device-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceLogVo.java

@@ -9,7 +9,7 @@ import java.util.List;
 * 设备日志视图对象
 *
 * @author zxfei
-* @date 2022-03-09
+* @date 2022-04-25
 */
 @Data
 public class DeviceLogVo extends BaseEntityLong {

device-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceVo.java

 package com.mortals.xhx.module.device.model.vo;
-
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.device.model.DeviceEntity;
 import lombok.Data;
 
 import java.util.ArrayList;
 import java.util.List;
-
 /**
- * 设备视图对象
- *
- * @author zxfei
- * @date 2022-03-09
- */
+* 设备视图对象
+*
+* @author zxfei
+* @date 2022-04-25
+*/
 @Data
 public class DeviceVo extends BaseEntityLong {
 
     /**
-     * 设备唯一标识
+     * 唯一标识
      */
     private String token;
 
+    private String menuUrl;
+
     /**
      * 登录时间
      */

device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java

@@ -16,6 +16,10 @@ import com.mortals.xhx.common.model.DefaultTbQueueMsgHeaders;
 import com.mortals.xhx.common.model.MessageHeader;
 import com.mortals.xhx.module.firm.model.FirmQuery;
 import com.mortals.xhx.module.firm.service.FirmService;
+import com.mortals.xhx.module.platform.model.PlatformQuery;
+import com.mortals.xhx.module.platform.service.PlatformService;
+import com.mortals.xhx.module.product.model.ProductQuery;
+import com.mortals.xhx.module.product.service.ProductService;
 import com.mortals.xhx.queue.TbQueueMsgHeaders;
 import com.mortals.xhx.queue.TopicPartitionInfo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +62,10 @@ public class DeviceController extends BaseCRUDJsonMappingController<DeviceServic
     private ParamService paramService;
     @Autowired
     private FirmService firmService;
+    @Autowired
+    private ProductService productService;
+    @Autowired
+    private PlatformService platformService;
 
     public DeviceController() {
         super.setFormClass(DeviceForm.class);
@@ -83,15 +91,20 @@ public class DeviceController extends BaseCRUDJsonMappingController<DeviceServic
         this.addDict(model, "status", paramService.getParamBySecondOrganize("Device", "status"));
         this.addDict(model, "active", paramService.getParamBySecondOrganize("Device", "active"));
         this.addDict(model, "deviceFirmId", firmService.find(new FirmQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getFirmName())));
+        this.addDict(model, "platformId", platformService.find(new PlatformQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getPlatformName())));
+        this.addDict(model, "productId", productService.find(new ProductQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getProductName())));
+
+
         Map<Boolean, Long> collect = this.service.find(new DeviceQuery().active(ActiveEnum.已激活.getValue())).stream().collect(Collectors.partitioningBy(item -> (item.getDeviceOnlineStatus() == DeviceOnlineStatusEnum.在线.getValue()), Collectors.counting()));
         model.put("onlineCount", collect.get(true));
         model.put("offlineCount", collect.get(false));
 
+
         //离线设备 按类型分组
-        if (collect.get(false) > 0) {
-            Map<String, Long> collectTwo = this.service.find(new DeviceQuery().deviceOnlineStatus(DeviceOnlineStatusEnum.离线.getValue()).active(ActiveEnum.已激活.getValue())).stream().collect(Collectors.groupingBy(x -> deviceTypeMap.get(x.getDeviceType().toString()), Collectors.counting()));
-            model.put("offlineDeviceType", collectTwo);
-        }
+//        if (collect.get(false) > 0) {
+//            Map<String, Long> collectTwo = this.service.find(new DeviceQuery().deviceOnlineStatus(DeviceOnlineStatusEnum.离线.getValue()).active(ActiveEnum.已激活.getValue())).stream().collect(Collectors.groupingBy(x -> deviceTypeMap.get(x.getDeviceType().toString()), Collectors.counting()));
+//            model.put("offlineDeviceType", collectTwo);
+//        }
         super.init(request, response, form, model, context);
     }
 

device-manager/src/main/java/com/mortals/xhx/module/platform/dao/PlatformDao.java

+package com.mortals.xhx.module.platform.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.platform.model.PlatformEntity;
+import java.util.List;
+/**
+* 平台系统Dao
+* 平台系统 DAO接口
+*
+* @author zxfei
+* @date 2022-04-25
+*/
+public interface  PlatformDao extends ICRUDDao<PlatformEntity,Long>{
+
+
+}

device-manager/src/main/java/com/mortals/xhx/module/platform/dao/ibatis/PlatformDaoImpl.java

+package com.mortals.xhx.module.platform.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.platform.dao.PlatformDao;
+import com.mortals.xhx.module.platform.model.PlatformEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 平台系统DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-04-25
+*/
+@Repository("platformDao")
+public class PlatformDaoImpl extends BaseCRUDDaoMybatis<PlatformEntity,Long> implements PlatformDao {
+
+
+
+}

device-manager/src/main/java/com/mortals/xhx/module/platform/model/PlatformEntity.java

+package com.mortals.xhx.module.platform.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.platform.model.vo.PlatformVo;
+/**
+* 平台系统实体对象
+*
+* @author zxfei
+* @date 2022-04-25
+*/
+
+public class PlatformEntity extends PlatformVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 平台名称，名称唯一
+    */
+    @Excel(name = "平台名称，名称唯一")
+    private String platformName;
+    /**
+    * 平台编码，编码唯一(编码加上站点编码，如phxt-51010251-1做Vhost虚拟机编码)
+    */
+    private String platformSn;
+    /**
+    * 发送第三方平台消息类型(0.http,1.jms)
+    */
+    private Integer sendMsgType;
+    /**
+    * 发送参数配置，如发送消息地址等，xml结构,根据消息类型变化
+    */
+    private String sendConfig;
+    /**
+    * 是否启用发送消息(0.停用,1.启用)
+    */
+    private Integer sendSwitch;
+    /**
+    * 备注
+    */
+    private String platformRemark;
+
+
+
+    public PlatformEntity(){}
+    /**
+    * 获取 平台名称，名称唯一
+    * @return String
+    */
+    public String getPlatformName(){
+        return platformName;
+    }
+    /**
+    * 设置 平台名称，名称唯一
+    * @param platformName
+    */
+    public void setPlatformName(String platformName){
+        this.platformName = platformName;
+    }
+    /**
+    * 获取 平台编码，编码唯一(编码加上站点编码，如phxt-51010251-1做Vhost虚拟机编码)
+    * @return String
+    */
+    public String getPlatformSn(){
+        return platformSn;
+    }
+    /**
+    * 设置 平台编码，编码唯一(编码加上站点编码，如phxt-51010251-1做Vhost虚拟机编码)
+    * @param platformSn
+    */
+    public void setPlatformSn(String platformSn){
+        this.platformSn = platformSn;
+    }
+    /**
+    * 获取 发送第三方平台消息类型(0.http,1.jms)
+    * @return Integer
+    */
+    public Integer getSendMsgType(){
+        return sendMsgType;
+    }
+    /**
+    * 设置 发送第三方平台消息类型(0.http,1.jms)
+    * @param sendMsgType
+    */
+    public void setSendMsgType(Integer sendMsgType){
+        this.sendMsgType = sendMsgType;
+    }
+    /**
+    * 获取 发送参数配置，如发送消息地址等，xml结构,根据消息类型变化
+    * @return String
+    */
+    public String getSendConfig(){
+        return sendConfig;
+    }
+    /**
+    * 设置 发送参数配置，如发送消息地址等，xml结构,根据消息类型变化
+    * @param sendConfig
+    */
+    public void setSendConfig(String sendConfig){
+        this.sendConfig = sendConfig;
+    }
+    /**
+    * 获取 是否启用发送消息(0.停用,1.启用)
+    * @return Integer
+    */
+    public Integer getSendSwitch(){
+        return sendSwitch;
+    }
+    /**
+    * 设置 是否启用发送消息(0.停用,1.启用)
+    * @param sendSwitch
+    */
+    public void setSendSwitch(Integer sendSwitch){
+        this.sendSwitch = sendSwitch;
+    }
+    /**
+    * 获取 备注
+    * @return String
+    */
+    public String getPlatformRemark(){
+        return platformRemark;
+    }
+    /**
+    * 设置 备注
+    * @param platformRemark
+    */
+    public void setPlatformRemark(String platformRemark){
+        this.platformRemark = platformRemark;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof PlatformEntity) {
+            PlatformEntity tmp = (PlatformEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",platformName:").append(getPlatformName());
+        sb.append(",platformSn:").append(getPlatformSn());
+        sb.append(",sendMsgType:").append(getSendMsgType());
+        sb.append(",sendConfig:").append(getSendConfig());
+        sb.append(",sendSwitch:").append(getSendSwitch());
+        sb.append(",platformRemark:").append(getPlatformRemark());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.platformName = "";
+
+            this.platformSn = "";
+
+            this.sendMsgType = 0;
+
+            this.sendConfig = "";
+
+            this.sendSwitch = 0;
+
+            this.platformRemark = "";
+    }
+}
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/platform/model/PlatformQuery.java

+package com.mortals.xhx.module.platform.model;
+
+import java.util.List;
+import com.mortals.xhx.module.platform.model.PlatformEntity;
+/**
+* 平台系统查询对象
+*
+* @author zxfei
+* @date 2022-04-25
+*/
+public class PlatformQuery extends PlatformEntity {
+    /** 开始 主键ID，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 主键ID，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 主键ID，主键，自增长 */
+    private Long idIncrement;
+
+    /** 主键ID，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 平台名称，名称唯一 */
+    private List<String> platformNameList;
+
+    /** 平台编码，编码唯一(编码加上站点编码，如phxt-51010251-1做Vhost虚拟机编码) */
+    private List<String> platformSnList;
+
+    /** 开始 发送第三方平台消息类型(0.http,1.jms) */
+    private Integer sendMsgTypeStart;
+
+    /** 结束 发送第三方平台消息类型(0.http,1.jms) */
+    private Integer sendMsgTypeEnd;
+
+    /** 增加 发送第三方平台消息类型(0.http,1.jms) */
+    private Integer sendMsgTypeIncrement;
+
+    /** 发送第三方平台消息类型(0.http,1.jms)列表 */
+    private List <Integer> sendMsgTypeList;
+
+    /** 发送参数配置，如发送消息地址等，xml结构,根据消息类型变化 */
+    private List<String> sendConfigList;
+
+    /** 开始 是否启用发送消息(0.停用,1.启用) */
+    private Integer sendSwitchStart;
+
+    /** 结束 是否启用发送消息(0.停用,1.启用) */
+    private Integer sendSwitchEnd;
+
+    /** 增加 是否启用发送消息(0.停用,1.启用) */
+    private Integer sendSwitchIncrement;
+
+    /** 是否启用发送消息(0.停用,1.启用)列表 */
+    private List <Integer> sendSwitchList;
+
+    /** 备注 */
+    private List<String> platformRemarkList;
+
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 更新用户 */
+    private Long updateUserIdStart;
+
+    /** 结束 更新用户 */
+    private Long updateUserIdEnd;
+
+    /** 增加 更新用户 */
+    private Long updateUserIdIncrement;
+
+    /** 更新用户列表 */
+    private List <Long> updateUserIdList;
+
+    /** 开始 更新时间 */
+    private String updateTimeStart;
+
+    /** 结束 更新时间 */
+    private String updateTimeEnd;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<PlatformQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<PlatformQuery> andConditionList;
+
+    public PlatformQuery(){}
+
+    /**
+    * 获取 开始 主键ID，主键，自增长
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 主键ID，主键，自增长
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 主键ID，主键，自增长
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 主键ID，主键，自增长
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 主键ID，主键，自增长
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 主键ID，主键，自增长
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 主键ID，主键，自增长
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 主键ID，主键，自增长
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 平台名称，名称唯一
+    * @return platformNameList
+    */
+    public List<String> getPlatformNameList(){
+        return this.platformNameList;
+    }
+
+    /**
+    * 设置 平台名称，名称唯一
+    * @param platformNameList
+    */
+    public void setPlatformNameList(List<String> platformNameList){
+        this.platformNameList = platformNameList;
+    }
+    /**
+    * 获取 平台编码，编码唯一(编码加上站点编码，如phxt-51010251-1做Vhost虚拟机编码)
+    * @return platformSnList
+    */
+    public List<String> getPlatformSnList(){
+        return this.platformSnList;
+    }
+
+    /**
+    * 设置 平台编码，编码唯一(编码加上站点编码，如phxt-51010251-1做Vhost虚拟机编码)
+    * @param platformSnList
+    */
+    public void setPlatformSnList(List<String> platformSnList){
+        this.platformSnList = platformSnList;
+    }
+    /**
+    * 获取 开始 发送第三方平台消息类型(0.http,1.jms)
+    * @return sendMsgTypeStart
+    */
+    public Integer getSendMsgTypeStart(){
+        return this.sendMsgTypeStart;
+    }
+
+    /**
+    * 设置 开始 发送第三方平台消息类型(0.http,1.jms)
+    * @param sendMsgTypeStart
+    */
+    public void setSendMsgTypeStart(Integer sendMsgTypeStart){
+        this.sendMsgTypeStart = sendMsgTypeStart;
+    }
+
+    /**
+    * 获取 结束 发送第三方平台消息类型(0.http,1.jms)
+    * @return $sendMsgTypeEnd
+    */
+    public Integer getSendMsgTypeEnd(){
+        return this.sendMsgTypeEnd;
+    }
+
+    /**
+    * 设置 结束 发送第三方平台消息类型(0.http,1.jms)
+    * @param sendMsgTypeEnd
+    */
+    public void setSendMsgTypeEnd(Integer sendMsgTypeEnd){
+        this.sendMsgTypeEnd = sendMsgTypeEnd;
+    }
+
+    /**
+    * 获取 增加 发送第三方平台消息类型(0.http,1.jms)
+    * @return sendMsgTypeIncrement
+    */
+    public Integer getSendMsgTypeIncrement(){
+        return this.sendMsgTypeIncrement;
+    }
+
+    /**
+    * 设置 增加 发送第三方平台消息类型(0.http,1.jms)
+    * @param sendMsgTypeIncrement
+    */
+    public void setSendMsgTypeIncrement(Integer sendMsgTypeIncrement){
+        this.sendMsgTypeIncrement = sendMsgTypeIncrement;
+    }
+
+    /**
+    * 获取 发送第三方平台消息类型(0.http,1.jms)
+    * @return sendMsgTypeList
+    */
+    public List<Integer> getSendMsgTypeList(){
+        return this.sendMsgTypeList;
+    }
+
+    /**
+    * 设置 发送第三方平台消息类型(0.http,1.jms)
+    * @param sendMsgTypeList
+    */
+    public void setSendMsgTypeList(List<Integer> sendMsgTypeList){
+        this.sendMsgTypeList = sendMsgTypeList;
+    }
+
+    /**
+    * 获取 发送参数配置，如发送消息地址等，xml结构,根据消息类型变化
+    * @return sendConfigList
+    */
+    public List<String> getSendConfigList(){
+        return this.sendConfigList;
+    }
+
+    /**
+    * 设置 发送参数配置，如发送消息地址等，xml结构,根据消息类型变化
+    * @param sendConfigList
+    */
+    public void setSendConfigList(List<String> sendConfigList){
+        this.sendConfigList = sendConfigList;
+    }
+    /**
+    * 获取 开始 是否启用发送消息(0.停用,1.启用)
+    * @return sendSwitchStart
+    */
+    public Integer getSendSwitchStart(){
+        return this.sendSwitchStart;
+    }
+
+    /**
+    * 设置 开始 是否启用发送消息(0.停用,1.启用)
+    * @param sendSwitchStart
+    */
+    public void setSendSwitchStart(Integer sendSwitchStart){
+        this.sendSwitchStart = sendSwitchStart;
+    }
+
+    /**
+    * 获取 结束 是否启用发送消息(0.停用,1.启用)
+    * @return $sendSwitchEnd
+    */
+    public Integer getSendSwitchEnd(){
+        return this.sendSwitchEnd;
+    }
+
+    /**
+    * 设置 结束 是否启用发送消息(0.停用,1.启用)
+    * @param sendSwitchEnd
+    */
+    public void setSendSwitchEnd(Integer sendSwitchEnd){
+        this.sendSwitchEnd = sendSwitchEnd;
+    }
+
+    /**
+    * 获取 增加 是否启用发送消息(0.停用,1.启用)
+    * @return sendSwitchIncrement
+    */
+    public Integer getSendSwitchIncrement(){
+        return this.sendSwitchIncrement;
+    }
+
+    /**
+    * 设置 增加 是否启用发送消息(0.停用,1.启用)
+    * @param sendSwitchIncrement
+    */
+    public void setSendSwitchIncrement(Integer sendSwitchIncrement){
+        this.sendSwitchIncrement = sendSwitchIncrement;
+    }
+
+    /**
+    * 获取 是否启用发送消息(0.停用,1.启用)
+    * @return sendSwitchList
+    */
+    public List<Integer> getSendSwitchList(){
+        return this.sendSwitchList;
+    }
+
+    /**
+    * 设置 是否启用发送消息(0.停用,1.启用)
+    * @param sendSwitchList
+    */
+    public void setSendSwitchList(List<Integer> sendSwitchList){
+        this.sendSwitchList = sendSwitchList;
+    }
+
+    /**
+    * 获取 备注
+    * @return platformRemarkList
+    */
+    public List<String> getPlatformRemarkList(){
+        return this.platformRemarkList;
+    }
+
+    /**
+    * 设置 备注
+    * @param platformRemarkList
+    */
+    public void setPlatformRemarkList(List<String> platformRemarkList){
+        this.platformRemarkList = platformRemarkList;
+    }
+    /**
+    * 获取 开始 创建用户
+    * @return createUserIdStart
+    */
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
+    }
+
+    /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+    }
+
+    /**
+    * 获取 结束 创建用户
+    * @return $createUserIdEnd
+    */
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 创建用户
+    * @return createUserIdIncrement
+    */
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdList
+    */
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+    }
+
+    /**
+    * 获取 开始 创建时间
+    * @return createTimeStart
+    */
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
+    }
+
+    /**
+    * 设置 开始 创建时间
+    * @param createTimeStart
+    */
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
+    }
+
+    /**
+    * 获取 结束 创建时间
+    * @return createTimeEnd
+    */
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
+    }
+
+    /**
+    * 设置 结束 创建时间
+    * @param createTimeEnd
+    */
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    /**
+    * 获取 开始 更新用户
+    * @return updateUserIdStart
+    */
+    public Long getUpdateUserIdStart(){
+        return this.updateUserIdStart;
+    }
+
+    /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public void setUpdateUserIdStart(Long updateUserIdStart){
+        this.updateUserIdStart = updateUserIdStart;
+    }
+
+    /**
+    * 获取 结束 更新用户
+    * @return $updateUserIdEnd
+    */
+    public Long getUpdateUserIdEnd(){
+        return this.updateUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public void setUpdateUserIdEnd(Long updateUserIdEnd){
+        this.updateUserIdEnd = updateUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 更新用户
+    * @return updateUserIdIncrement
+    */
+    public Long getUpdateUserIdIncrement(){
+        return this.updateUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
+        this.updateUserIdIncrement = updateUserIdIncrement;
+    }
+
+    /**
+    * 获取 更新用户
+    * @return updateUserIdList
+    */
+    public List<Long> getUpdateUserIdList(){
+        return this.updateUserIdList;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public void setUpdateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+    }
+
+    /**
+    * 获取 开始 更新时间
+    * @return updateTimeStart
+    */
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
+    }
+
+    /**
+    * 设置 开始 更新时间
+    * @param updateTimeStart
+    */
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
+    }
+
+    /**
+    * 获取 结束 更新时间
+    * @return updateTimeEnd
+    */
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
+    }
+
+    /**
+    * 设置 结束 更新时间
+    * @param updateTimeEnd
+    */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
+
+    /**
+    * 设置  主键ID，主键，自增长
+    * @param id
+    */
+    public PlatformQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 主键ID，主键，自增长
+    * @param idStart
+    */
+    public PlatformQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 主键ID，主键，自增长
+    * @param idEnd
+    */
+    public PlatformQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 主键ID，主键，自增长
+    * @param idIncrement
+    */
+    public PlatformQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 主键ID，主键，自增长
+    * @param idList
+    */
+    public PlatformQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+
+	/**
+    * 设置 平台名称，名称唯一
+    * @param platformName
+    */
+    public PlatformQuery platformName(String platformName){
+        setPlatformName(platformName);
+		return this;
+    }
+
+    /**
+    * 设置 平台名称，名称唯一
+    * @param platformNameList
+    */
+    public PlatformQuery platformNameList(List<String> platformNameList){
+        this.platformNameList = platformNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 平台编码，编码唯一(编码加上站点编码，如phxt-51010251-1做Vhost虚拟机编码)
+    * @param platformSn
+    */
+    public PlatformQuery platformSn(String platformSn){
+        setPlatformSn(platformSn);
+		return this;
+    }
+
+    /**
+    * 设置 平台编码，编码唯一(编码加上站点编码，如phxt-51010251-1做Vhost虚拟机编码)
+    * @param platformSnList
+    */
+    public PlatformQuery platformSnList(List<String> platformSnList){
+        this.platformSnList = platformSnList;
+		return this;
+    }
+
+    /**
+    * 设置  发送第三方平台消息类型(0.http,1.jms)
+    * @param sendMsgType
+    */
+    public PlatformQuery sendMsgType(Integer sendMsgType){
+	    setSendMsgType(sendMsgType);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 发送第三方平台消息类型(0.http,1.jms)
+    * @param sendMsgTypeStart
+    */
+    public PlatformQuery sendMsgTypeStart(Integer sendMsgTypeStart){
+		this.sendMsgTypeStart = sendMsgTypeStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 发送第三方平台消息类型(0.http,1.jms)
+    * @param sendMsgTypeEnd
+    */
+    public PlatformQuery sendMsgTypeEnd(Integer sendMsgTypeEnd){
+		this.sendMsgTypeEnd = sendMsgTypeEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 发送第三方平台消息类型(0.http,1.jms)
+    * @param sendMsgTypeIncrement
+    */
+    public PlatformQuery sendMsgTypeIncrement(Integer sendMsgTypeIncrement){
+		this.sendMsgTypeIncrement = sendMsgTypeIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 发送第三方平台消息类型(0.http,1.jms)
+    * @param sendMsgTypeList
+    */
+    public PlatformQuery sendMsgTypeList(List<Integer> sendMsgTypeList){
+        this.sendMsgTypeList = sendMsgTypeList;
+		return this;
+        }
+
+
+	/**
+    * 设置 发送参数配置，如发送消息地址等，xml结构,根据消息类型变化
+    * @param sendConfig
+    */
+    public PlatformQuery sendConfig(String sendConfig){
+        setSendConfig(sendConfig);
+		return this;
+    }
+
+    /**
+    * 设置 发送参数配置，如发送消息地址等，xml结构,根据消息类型变化
+    * @param sendConfigList
+    */
+    public PlatformQuery sendConfigList(List<String> sendConfigList){
+        this.sendConfigList = sendConfigList;
+		return this;
+    }
+
+    /**
+    * 设置  是否启用发送消息(0.停用,1.启用)
+    * @param sendSwitch
+    */
+    public PlatformQuery sendSwitch(Integer sendSwitch){
+	    setSendSwitch(sendSwitch);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 是否启用发送消息(0.停用,1.启用)
+    * @param sendSwitchStart
+    */
+    public PlatformQuery sendSwitchStart(Integer sendSwitchStart){
+		this.sendSwitchStart = sendSwitchStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 是否启用发送消息(0.停用,1.启用)
+    * @param sendSwitchEnd
+    */
+    public PlatformQuery sendSwitchEnd(Integer sendSwitchEnd){
+		this.sendSwitchEnd = sendSwitchEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 是否启用发送消息(0.停用,1.启用)
+    * @param sendSwitchIncrement
+    */
+    public PlatformQuery sendSwitchIncrement(Integer sendSwitchIncrement){
+		this.sendSwitchIncrement = sendSwitchIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 是否启用发送消息(0.停用,1.启用)
+    * @param sendSwitchList
+    */
+    public PlatformQuery sendSwitchList(List<Integer> sendSwitchList){
+        this.sendSwitchList = sendSwitchList;
+		return this;
+        }
+
+
+	/**
+    * 设置 备注
+    * @param platformRemark
+    */
+    public PlatformQuery platformRemark(String platformRemark){
+        setPlatformRemark(platformRemark);
+		return this;
+    }
+
+    /**
+    * 设置 备注
+    * @param platformRemarkList
+    */
+    public PlatformQuery platformRemarkList(List<String> platformRemarkList){
+        this.platformRemarkList = platformRemarkList;
+		return this;
+    }
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public PlatformQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public PlatformQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public PlatformQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public PlatformQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public PlatformQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+
+    /**
+    * 设置  更新用户
+    * @param updateUserId
+    */
+    public PlatformQuery updateUserId(Long updateUserId){
+	    setUpdateUserId(updateUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public PlatformQuery updateUserIdStart(Long updateUserIdStart){
+		this.updateUserIdStart = updateUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public PlatformQuery updateUserIdEnd(Long updateUserIdEnd){
+		this.updateUserIdEnd = updateUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public PlatformQuery updateUserIdIncrement(Long updateUserIdIncrement){
+		this.updateUserIdIncrement = updateUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public PlatformQuery updateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+		return this;
+        }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<PlatformQuery> getOrConditionList(){
+    return this.orConditionList;
+    }
+
+    /**
+    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @param orConditionList
+    */
+    public void setOrConditionList(List<PlatformQuery> orConditionList){
+        this.orConditionList = orConditionList;
+    }
+
+    /**
+    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @return andConditionList
+    */
+    public List<PlatformQuery> getAndConditionList(){
+        return this.andConditionList;
+    }
+
+    /**
+    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @param andConditionList
+    */
+    public void setAndConditionList(List<PlatformQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/platform/model/vo/PlatformVo.java

+package com.mortals.xhx.module.platform.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.platform.model.PlatformEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 平台系统视图对象
+*
+* @author zxfei
+* @date 2022-04-25
+*/
+@Data
+public class PlatformVo extends BaseEntityLong {
+
+}
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/platform/service/PlatformService.java

+package com.mortals.xhx.module.platform.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.platform.model.PlatformEntity;
+/**
+* PlatformService
+*
+* 平台系统 service接口
+*
+* @author zxfei
+* @date 2022-04-25
+*/
+public interface PlatformService extends ICRUDService<PlatformEntity,Long>{
+
+}
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/platform/service/impl/PlatformServiceImpl.java

+package com.mortals.xhx.module.platform.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.platform.dao.PlatformDao;
+import com.mortals.xhx.module.platform.model.PlatformEntity;
+import com.mortals.xhx.module.platform.service.PlatformService;
+/**
+* PlatformService
+* 平台系统 service实现
+*
+* @author zxfei
+* @date 2022-04-25
+*/
+@Service("platformService")
+public class PlatformServiceImpl extends AbstractCRUDServiceImpl<PlatformDao, PlatformEntity, Long> implements PlatformService {
+    
+}
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/platform/web/PlatformController.java

+package com.mortals.xhx.module.platform.web;
+
+import com.mortals.xhx.base.system.param.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonMappingController;
+import com.mortals.xhx.module.platform.model.PlatformEntity;
+import com.mortals.xhx.module.platform.model.PlatformQuery;
+import com.mortals.xhx.module.platform.service.PlatformService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+/**
+*
+* 平台系统
+*
+* @author zxfei
+* @date 2022-04-25
+*/
+@RestController
+@RequestMapping("platform")
+public class PlatformController extends BaseCRUDJsonMappingController<PlatformService,PlatformForm,PlatformEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public PlatformController(){
+        super.setFormClass(PlatformForm.class);
+        super.setModuleDesc( "平台系统");
+    }
+
+    @Override
+    protected void init(HttpServletRequest request, HttpServletResponse response, PlatformForm form, Map<String, Object> model, Context context) {
+        this.addDict(model, "sendMsgType", paramService.getParamBySecondOrganize("Platform","sendMsgType"));
+        this.addDict(model, "sendSwitch", paramService.getParamBySecondOrganize("Platform","sendSwitch"));
+        super.init(request, response, form, model, context);
+    }
+
+}
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/platform/web/PlatformForm.java

+package com.mortals.xhx.module.platform.web;
+
+
+import com.mortals.framework.web.BaseCRUDFormLong;
+import com.mortals.xhx.module.platform.model.PlatformEntity;
+import com.mortals.xhx.module.platform.model.PlatformQuery;
+
+/**
+* Platform
+*
+* 平台系统 Form
+*
+* @author zxfei
+* @date 2022-04-25
+*/
+public class PlatformForm extends BaseCRUDFormLong<PlatformEntity> {
+    private PlatformEntity entity = new PlatformEntity();
+    private PlatformQuery query = new PlatformQuery();
+    public PlatformForm(){
+    }
+
+    @Override
+    public PlatformEntity getEntity() {
+        return entity;
+    }
+
+    public void setPlatform(PlatformEntity entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public PlatformQuery getQuery() {
+        return query;
+    }
+
+    public void setQuery(PlatformQuery query) {
+        this.query = query;
+    }
+}
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/product/dao/ProductDao.java

+package com.mortals.xhx.module.product.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.product.model.ProductEntity;
+import java.util.List;
+/**
+* 产品Dao
+* 产品 DAO接口
+*
+* @author zxfei
+* @date 2022-04-25
+*/
+public interface  ProductDao extends ICRUDDao<ProductEntity,Long>{
+
+
+}

device-manager/src/main/java/com/mortals/xhx/module/product/dao/ibatis/ProductDaoImpl.java

+package com.mortals.xhx.module.product.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.product.dao.ProductDao;
+import com.mortals.xhx.module.product.model.ProductEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 产品DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-04-25
+*/
+@Repository("productDao")
+public class ProductDaoImpl extends BaseCRUDDaoMybatis<ProductEntity,Long> implements ProductDao {
+
+
+
+}

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-04-25
+*/
+
+public class ProductEntity extends ProductVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 产品名称，名称唯一
+    */
+    @Excel(name = "产品名称，名称唯一")
+    private String productName;
+    /**
+    * 产品编码，编码唯一
+    */
+    private String productCode;
+    /**
+    * 交换机名称,英文必填，默认产品编码
+    */
+    private String exchangeName;
+    /**
+    * 备注
+    */
+    private String productRemark;
+
+
+
+    public ProductEntity(){}
+    /**
+    * 获取 产品名称，名称唯一
+    * @return String
+    */
+    public String getProductName(){
+        return productName;
+    }
+    /**
+    * 设置 产品名称，名称唯一
+    * @param productName
+    */
+    public void setProductName(String productName){
+        this.productName = productName;
+    }
+    /**
+    * 获取 产品编码，编码唯一
+    * @return String
+    */
+    public String getProductCode(){
+        return productCode;
+    }
+    /**
+    * 设置 产品编码，编码唯一
+    * @param productCode
+    */
+    public void setProductCode(String productCode){
+        this.productCode = productCode;
+    }
+    /**
+    * 获取 交换机名称,英文必填，默认产品编码
+    * @return String
+    */
+    public String getExchangeName(){
+        return exchangeName;
+    }
+    /**
+    * 设置 交换机名称,英文必填，默认产品编码
+    * @param exchangeName
+    */
+    public void setExchangeName(String exchangeName){
+        this.exchangeName = exchangeName;
+    }
+    /**
+    * 获取 备注
+    * @return String
+    */
+    public String getProductRemark(){
+        return productRemark;
+    }
+    /**
+    * 设置 备注
+    * @param productRemark
+    */
+    public void setProductRemark(String productRemark){
+        this.productRemark = productRemark;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof ProductEntity) {
+            ProductEntity tmp = (ProductEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",productName:").append(getProductName());
+        sb.append(",productCode:").append(getProductCode());
+        sb.append(",exchangeName:").append(getExchangeName());
+        sb.append(",productRemark:").append(getProductRemark());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.productName = "";
+
+            this.productCode = "";
+
+            this.exchangeName = "";
+
+            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-04-25
+*/
+public class ProductQuery extends ProductEntity {
+    /** 开始 主键ID，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 主键ID，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 主键ID，主键，自增长 */
+    private Long idIncrement;
+
+    /** 主键ID，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 产品名称，名称唯一 */
+    private List<String> productNameList;
+
+    /** 产品编码，编码唯一 */
+    private List<String> productCodeList;
+
+    /** 交换机名称,英文必填，默认产品编码 */
+    private List<String> exchangeNameList;
+
+    /** 备注 */
+    private List<String> productRemarkList;
+
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 更新用户 */
+    private Long updateUserIdStart;
+
+    /** 结束 更新用户 */
+    private Long updateUserIdEnd;
+
+    /** 增加 更新用户 */
+    private Long updateUserIdIncrement;
+
+    /** 更新用户列表 */
+    private List <Long> updateUserIdList;
+
+    /** 开始 更新时间 */
+    private String updateTimeStart;
+
+    /** 结束 更新时间 */
+    private String updateTimeEnd;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<ProductQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<ProductQuery> andConditionList;
+
+    public ProductQuery(){}
+
+    /**
+    * 获取 开始 主键ID，主键，自增长
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 主键ID，主键，自增长
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 主键ID，主键，自增长
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 主键ID，主键，自增长
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 主键ID，主键，自增长
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 主键ID，主键，自增长
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 主键ID，主键，自增长
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 主键ID，主键，自增长
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 产品名称，名称唯一
+    * @return productNameList
+    */
+    public List<String> getProductNameList(){
+        return this.productNameList;
+    }
+
+    /**
+    * 设置 产品名称，名称唯一
+    * @param productNameList
+    */
+    public void setProductNameList(List<String> productNameList){
+        this.productNameList = productNameList;
+    }
+    /**
+    * 获取 产品编码，编码唯一
+    * @return productCodeList
+    */
+    public List<String> getProductCodeList(){
+        return this.productCodeList;
+    }
+
+    /**
+    * 设置 产品编码，编码唯一
+    * @param productCodeList
+    */
+    public void setProductCodeList(List<String> productCodeList){
+        this.productCodeList = productCodeList;
+    }
+    /**
+    * 获取 交换机名称,英文必填，默认产品编码
+    * @return exchangeNameList
+    */
+    public List<String> getExchangeNameList(){
+        return this.exchangeNameList;
+    }
+
+    /**
+    * 设置 交换机名称,英文必填，默认产品编码
+    * @param exchangeNameList
+    */
+    public void setExchangeNameList(List<String> exchangeNameList){
+        this.exchangeNameList = exchangeNameList;
+    }
+    /**
+    * 获取 备注
+    * @return productRemarkList
+    */
+    public List<String> getProductRemarkList(){
+        return this.productRemarkList;
+    }
+
+    /**
+    * 设置 备注
+    * @param productRemarkList
+    */
+    public void setProductRemarkList(List<String> productRemarkList){
+        this.productRemarkList = productRemarkList;
+    }
+    /**
+    * 获取 开始 创建用户
+    * @return createUserIdStart
+    */
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
+    }
+
+    /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+    }
+
+    /**
+    * 获取 结束 创建用户
+    * @return $createUserIdEnd
+    */
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 创建用户
+    * @return createUserIdIncrement
+    */
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdList
+    */
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+    }
+
+    /**
+    * 获取 开始 创建时间
+    * @return createTimeStart
+    */
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
+    }
+
+    /**
+    * 设置 开始 创建时间
+    * @param createTimeStart
+    */
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
+    }
+
+    /**
+    * 获取 结束 创建时间
+    * @return createTimeEnd
+    */
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
+    }
+
+    /**
+    * 设置 结束 创建时间
+    * @param createTimeEnd
+    */
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    /**
+    * 获取 开始 更新用户
+    * @return updateUserIdStart
+    */
+    public Long getUpdateUserIdStart(){
+        return this.updateUserIdStart;
+    }
+
+    /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public void setUpdateUserIdStart(Long updateUserIdStart){
+        this.updateUserIdStart = updateUserIdStart;
+    }
+
+    /**
+    * 获取 结束 更新用户
+    * @return $updateUserIdEnd
+    */
+    public Long getUpdateUserIdEnd(){
+        return this.updateUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public void setUpdateUserIdEnd(Long updateUserIdEnd){
+        this.updateUserIdEnd = updateUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 更新用户
+    * @return updateUserIdIncrement
+    */
+    public Long getUpdateUserIdIncrement(){
+        return this.updateUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
+        this.updateUserIdIncrement = updateUserIdIncrement;
+    }
+
+    /**
+    * 获取 更新用户
+    * @return updateUserIdList
+    */
+    public List<Long> getUpdateUserIdList(){
+        return this.updateUserIdList;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public void setUpdateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+    }
+
+    /**
+    * 获取 开始 更新时间
+    * @return updateTimeStart
+    */
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
+    }
+
+    /**
+    * 设置 开始 更新时间
+    * @param updateTimeStart
+    */
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
+    }
+
+    /**
+    * 获取 结束 更新时间
+    * @return updateTimeEnd
+    */
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
+    }
+
+    /**
+    * 设置 结束 更新时间
+    * @param updateTimeEnd
+    */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
+
+    /**
+    * 设置  主键ID，主键，自增长
+    * @param id
+    */
+    public ProductQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 主键ID，主键，自增长
+    * @param idStart
+    */
+    public ProductQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 主键ID，主键，自增长
+    * @param idEnd
+    */
+    public ProductQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 主键ID，主键，自增长
+    * @param idIncrement
+    */
+    public ProductQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 主键ID，主键，自增长
+    * @param idList
+    */
+    public ProductQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+
+	/**
+    * 设置 产品名称，名称唯一
+    * @param productName
+    */
+    public ProductQuery productName(String productName){
+        setProductName(productName);
+		return this;
+    }
+
+    /**
+    * 设置 产品名称，名称唯一
+    * @param productNameList
+    */
+    public ProductQuery productNameList(List<String> productNameList){
+        this.productNameList = productNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 产品编码，编码唯一
+    * @param productCode
+    */
+    public ProductQuery productCode(String productCode){
+        setProductCode(productCode);
+		return this;
+    }
+
+    /**
+    * 设置 产品编码，编码唯一
+    * @param productCodeList
+    */
+    public ProductQuery productCodeList(List<String> productCodeList){
+        this.productCodeList = productCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 交换机名称,英文必填，默认产品编码
+    * @param exchangeName
+    */
+    public ProductQuery exchangeName(String exchangeName){
+        setExchangeName(exchangeName);
+		return this;
+    }
+
+    /**
+    * 设置 交换机名称,英文必填，默认产品编码
+    * @param exchangeNameList
+    */
+    public ProductQuery exchangeNameList(List<String> exchangeNameList){
+        this.exchangeNameList = exchangeNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 备注
+    * @param productRemark
+    */
+    public ProductQuery productRemark(String productRemark){
+        setProductRemark(productRemark);
+		return this;
+    }
+
+    /**
+    * 设置 备注
+    * @param productRemarkList
+    */
+    public ProductQuery productRemarkList(List<String> productRemarkList){
+        this.productRemarkList = productRemarkList;
+		return this;
+    }
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public ProductQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public ProductQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public ProductQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public ProductQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public ProductQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+
+    /**
+    * 设置  更新用户
+    * @param updateUserId
+    */
+    public ProductQuery updateUserId(Long updateUserId){
+	    setUpdateUserId(updateUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public ProductQuery updateUserIdStart(Long updateUserIdStart){
+		this.updateUserIdStart = updateUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public ProductQuery updateUserIdEnd(Long updateUserIdEnd){
+		this.updateUserIdEnd = updateUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public ProductQuery updateUserIdIncrement(Long updateUserIdIncrement){
+		this.updateUserIdIncrement = updateUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public ProductQuery updateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+		return this;
+        }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<ProductQuery> getOrConditionList(){
+    return this.orConditionList;
+    }
+
+    /**
+    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @param orConditionList
+    */
+    public void setOrConditionList(List<ProductQuery> orConditionList){
+        this.orConditionList = orConditionList;
+    }
+
+    /**
+    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @return andConditionList
+    */
+    public List<ProductQuery> getAndConditionList(){
+        return this.andConditionList;
+    }
+
+    /**
+    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @param andConditionList
+    */
+    public void setAndConditionList(List<ProductQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

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

+package com.mortals.xhx.module.product.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.product.model.ProductEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 产品视图对象
+*
+* @author zxfei
+* @date 2022-04-25
+*/
+@Data
+public class ProductVo extends BaseEntityLong {
+
+}
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/product/service/ProductService.java

+package com.mortals.xhx.module.product.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.product.model.ProductEntity;
+/**
+* ProductService
+*
+* 产品 service接口
+*
+* @author zxfei
+* @date 2022-04-25
+*/
+public interface ProductService extends ICRUDService<ProductEntity,Long>{
+
+}
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/product/service/impl/ProductServiceImpl.java

+package com.mortals.xhx.module.product.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.product.dao.ProductDao;
+import com.mortals.xhx.module.product.model.ProductEntity;
+import com.mortals.xhx.module.product.service.ProductService;
+/**
+* ProductService
+* 产品 service实现
+*
+* @author zxfei
+* @date 2022-04-25
+*/
+@Service("productService")
+public class ProductServiceImpl extends AbstractCRUDServiceImpl<ProductDao, ProductEntity, Long> implements ProductService {
+    
+}
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/product/web/ProductController.java

+package com.mortals.xhx.module.product.web;
+
+import com.mortals.xhx.base.system.param.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonMappingController;
+import com.mortals.xhx.module.product.model.ProductEntity;
+import com.mortals.xhx.module.product.model.ProductQuery;
+import com.mortals.xhx.module.product.service.ProductService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+/**
+*
+* 产品
+*
+* @author zxfei
+* @date 2022-04-25
+*/
+@RestController
+@RequestMapping("product")
+public class ProductController extends BaseCRUDJsonMappingController<ProductService,ProductForm,ProductEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public ProductController(){
+        super.setFormClass(ProductForm.class);
+        super.setModuleDesc( "产品");
+    }
+
+    @Override
+    protected void init(HttpServletRequest request, HttpServletResponse response, ProductForm form, Map<String, Object> model, Context context) {
+        super.init(request, response, form, model, context);
+    }
+
+}
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/product/web/ProductForm.java

+package com.mortals.xhx.module.product.web;
+
+
+import com.mortals.framework.web.BaseCRUDFormLong;
+import com.mortals.xhx.module.product.model.ProductEntity;
+import com.mortals.xhx.module.product.model.ProductQuery;
+
+/**
+* Product
+*
+* 产品 Form
+*
+* @author zxfei
+* @date 2022-04-25
+*/
+public class ProductForm extends BaseCRUDFormLong<ProductEntity> {
+    private ProductEntity entity = new ProductEntity();
+    private ProductQuery query = new ProductQuery();
+    public ProductForm(){
+    }
+
+    @Override
+    public ProductEntity getEntity() {
+        return entity;
+    }
+
+    public void setProduct(ProductEntity entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public ProductQuery getQuery() {
+        return query;
+    }
+
+    public void setQuery(ProductQuery query) {
+        this.query = query;
+    }
+}
\ No newline at end of file

device-manager/src/main/resources/sqlmap/module/device/DeviceLogMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "mybatis-3-mapper.dtd">
+"mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.device.dao.ibatis.DeviceLogDaoImpl">
 
     <!-- 字段和属性映射 -->
     <resultMap type="DeviceLogEntity" id="DeviceLogEntity-Map">
-        <id  property="id" column="id" />
-        <result property="deviceId" column="deviceId" />
-        <result property="deviceNum" column="deviceNum" />
-        <result property="deviceName" column="deviceName" />
-        <result property="logType" column="logType" />
-        <result property="content" column="content" />
-        <result property="createTime" column="createTime" />
-
+            <id  property="id" column="id" />
+            <result property="deviceId" column="deviceId" />
+            <result property="deviceNum" column="deviceNum" />
+            <result property="deviceName" column="deviceName" />
+            <result property="logType" column="logType" />
+            <result property="content" column="content" />
+            <result property="createUserId" column="createUserId" />
+            <result property="createTime" column="createTime" />
+            <result property="updateUserId" column="updateUserId" />
+            <result property="updateTime" column="updateTime" />
+            
     </resultMap>
 
 
     <!-- 表所有列 -->
     <sql id="_columns">
         <trim suffixOverrides="," suffix="">
-            <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('deviceId') or colPickMode == 1 and data.containsKey('deviceId')))">
-                a.deviceId,
-            </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('deviceName') or colPickMode == 1 and data.containsKey('deviceName')))">
-                a.deviceName,
-            </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('logType') or colPickMode == 1 and data.containsKey('logType')))">
-                a.logType,
-            </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('content') or colPickMode == 1 and data.containsKey('content')))">
-                a.content,
-            </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
-                a.createTime,
-            </if>
+                <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('deviceId') or colPickMode == 1 and data.containsKey('deviceId')))">
+                    a.deviceId,
+                </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('deviceName') or colPickMode == 1 and data.containsKey('deviceName')))">
+                    a.deviceName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('logType') or colPickMode == 1 and data.containsKey('logType')))">
+                    a.logType,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('content') or colPickMode == 1 and data.containsKey('content')))">
+                    a.content,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                    a.createUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.createTime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
+                    a.updateUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                    a.updateTime,
+                </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="DeviceLogEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_device_log
-        (deviceId,deviceNum,deviceName,logType,content,createTime)
+        (deviceId,deviceNum,deviceName,logType,content,createUserId,createTime,updateUserId,updateTime)
         VALUES
-        (#{deviceId},#{deviceNum},#{deviceName},#{logType},#{content},#{createTime})
+        (#{deviceId},#{deviceNum},#{deviceName},#{logType},#{content},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_device_log
-        (deviceId,deviceNum,deviceName,logType,content,createTime)
+        (deviceId,deviceNum,deviceName,logType,content,createUserId,createTime,updateUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.deviceId},#{item.deviceNum},#{item.deviceName},#{item.logType},#{item.content},#{item.createTime})
+            (#{item.deviceId},#{item.deviceNum},#{item.deviceName},#{item.logType},#{item.content},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -87,9 +99,24 @@
             <if test="(colPickMode==0 and data.containsKey('content')) or (colPickMode==1 and !data.containsKey('content'))">
                 a.content=#{data.content},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
+                a.createUserId=#{data.createUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+                a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
                 a.createTime=#{data.createTime},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
+                a.updateUserId=#{data.updateUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
+                a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+                a.updateTime=#{data.updateTime},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -102,58 +129,89 @@
     <update id="updateBatch" parameterType="paramDto">
         update mortals_xhx_device_log as a
         <trim prefix="set" suffixOverrides=",">
-            <trim prefix="deviceId=(case" suffix="ELSE deviceId end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <choose>
-                        <when test="(colPickMode==0 and item.containsKey('deviceId')) or (colPickMode==1 and !item.containsKey('deviceId'))">
-                            when a.id=#{item.id} then #{item.deviceId}
-                        </when>
-                        <when test="(colPickMode==0 and item.containsKey('deviceIdIncrement')) or (colPickMode==1 and !item.containsKey('deviceIdIncrement'))">
-                            when a.id=#{item.id} then ifnull(a.deviceId,0) + #{item.deviceIdIncrement}
-                        </when>
-                    </choose>
-                </foreach>
-            </trim>
-            <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="deviceName=(case" suffix="ELSE deviceName end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('deviceName')) or (colPickMode==1 and !item.containsKey('deviceName'))">
-                        when a.id=#{item.id} then #{item.deviceName}
-                    </if>
-                </foreach>
-            </trim>
-            <trim prefix="logType=(case" suffix="ELSE logType end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <choose>
-                        <when test="(colPickMode==0 and item.containsKey('logType')) or (colPickMode==1 and !item.containsKey('logType'))">
-                            when a.id=#{item.id} then #{item.logType}
-                        </when>
-                        <when test="(colPickMode==0 and item.containsKey('logTypeIncrement')) or (colPickMode==1 and !item.containsKey('logTypeIncrement'))">
-                            when a.id=#{item.id} then ifnull(a.logType,0) + #{item.logTypeIncrement}
-                        </when>
-                    </choose>
-                </foreach>
-            </trim>
-            <trim prefix="content=(case" suffix="ELSE content end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('content')) or (colPickMode==1 and !item.containsKey('content'))">
-                        when a.id=#{item.id} then #{item.content}
-                    </if>
-                </foreach>
-            </trim>
-            <trim prefix="createTime=(case" suffix="ELSE createTime end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
-                        when a.id=#{item.id} then #{item.createTime}
-                    </if>
-                </foreach>
-            </trim>
+                        <trim prefix="deviceId=(case" suffix="ELSE deviceId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('deviceId')) or (colPickMode==1 and !item.containsKey('deviceId'))">
+                                        when a.id=#{item.id} then #{item.deviceId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('deviceIdIncrement')) or (colPickMode==1 and !item.containsKey('deviceIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.deviceId,0) + #{item.deviceIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <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="deviceName=(case" suffix="ELSE deviceName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('deviceName')) or (colPickMode==1 and !item.containsKey('deviceName'))">
+                            when a.id=#{item.id} then #{item.deviceName}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="logType=(case" suffix="ELSE logType end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('logType')) or (colPickMode==1 and !item.containsKey('logType'))">
+                                        when a.id=#{item.id} then #{item.logType}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('logTypeIncrement')) or (colPickMode==1 and !item.containsKey('logTypeIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.logType,0) + #{item.logTypeIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="content=(case" suffix="ELSE content end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('content')) or (colPickMode==1 and !item.containsKey('content'))">
+                            when a.id=#{item.id} then #{item.content}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                                        when a.id=#{item.id} then #{item.createUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                            when a.id=#{item.id} then #{item.createTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
+                                        when a.id=#{item.id} then #{item.updateUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                            when a.id=#{item.id} then #{item.updateTime}
+                        </if>
+                    </foreach>
+                </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -255,177 +313,249 @@
                 ${_conditionType_} a.id=#{${_conditionParam_}.id}
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('id')">
-            <if test="conditionParamRef.id != null ">
-                ${_conditionType_} a.id = #{${_conditionParam_}.id}
+            <if test="conditionParamRef.containsKey('id')">
+                <if test="conditionParamRef.id != null ">
+                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
+                </if>
+                <if test="conditionParamRef.id == null">
+                    ${_conditionType_} a.id is null
+                </if>
             </if>
-            <if test="conditionParamRef.id == null">
-                ${_conditionType_} a.id is null
+            <if test="conditionParamRef.containsKey('idList')">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+                ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+            </if>
+            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
             </if>
-        </if>
-        <if test="conditionParamRef.containsKey('idList')">
-            ${_conditionType_} a.id in
-            <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
-                #{item}
-            </foreach>
-        </if>
-        <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
-            ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
-        </if>
-        <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
-            ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
-        </if>
 
-        <if test="conditionParamRef.containsKey('deviceId')">
-            <if test="conditionParamRef.deviceId != null ">
-                ${_conditionType_} a.deviceId = #{${_conditionParam_}.deviceId}
+            <if test="conditionParamRef.containsKey('deviceId')">
+                <if test="conditionParamRef.deviceId != null ">
+                    ${_conditionType_} a.deviceId = #{${_conditionParam_}.deviceId}
+                </if>
+                <if test="conditionParamRef.deviceId == null">
+                    ${_conditionType_} a.deviceId is null
+                </if>
             </if>
-            <if test="conditionParamRef.deviceId == null">
-                ${_conditionType_} a.deviceId is null
+            <if test="conditionParamRef.containsKey('deviceIdList')">
+                ${_conditionType_} a.deviceId in
+                <foreach collection="conditionParamRef.deviceIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceIdStart') and conditionParamRef.deviceIdStart != null">
+                ${_conditionType_} a.deviceId <![CDATA[ >= ]]> #{${_conditionParam_}.deviceIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('deviceIdEnd') and conditionParamRef.deviceIdEnd != null">
+                ${_conditionType_} a.deviceId <![CDATA[ <= ]]> #{${_conditionParam_}.deviceIdEnd}
             </if>
-        </if>
-        <if test="conditionParamRef.containsKey('deviceIdList')">
-            ${_conditionType_} a.deviceId in
-            <foreach collection="conditionParamRef.deviceIdList" open="(" close=")" index="index" item="item" separator=",">
-                #{item}
-            </foreach>
-        </if>
-        <if test="conditionParamRef.containsKey('deviceIdStart') and conditionParamRef.deviceIdStart != null">
-            ${_conditionType_} a.deviceId <![CDATA[ >= ]]> #{${_conditionParam_}.deviceIdStart}
-        </if>
-        <if test="conditionParamRef.containsKey('deviceIdEnd') and conditionParamRef.deviceIdEnd != null">
-            ${_conditionType_} a.deviceId <![CDATA[ <= ]]> #{${_conditionParam_}.deviceIdEnd}
-        </if>
 
 
-        <if test="conditionParamRef.containsKey('deviceNum')">
-            <if test="conditionParamRef.deviceNum != null and conditionParamRef.deviceNum != ''">
-                ${_conditionType_} a.deviceNum like #{${_conditionParam_}.deviceNum}
+            <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.deviceNum == null">
-                ${_conditionType_} a.deviceNum is null
+            <if test="conditionParamRef.containsKey('deviceNumList')">
+                ${_conditionType_} a.deviceNum in
+                <foreach collection="conditionParamRef.deviceNumList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
             </if>
-        </if>
-        <if test="conditionParamRef.containsKey('deviceNumList')">
-            ${_conditionType_} a.deviceNum in
-            <foreach collection="conditionParamRef.deviceNumList" open="(" close=")" index="index" item="item" separator=",">
-                #{item}
-            </foreach>
-        </if>
 
-        <if test="conditionParamRef.containsKey('deviceName')">
-            <if test="conditionParamRef.deviceName != null and conditionParamRef.deviceName != ''">
-                ${_conditionType_} a.deviceName like #{${_conditionParam_}.deviceName}
+            <if test="conditionParamRef.containsKey('deviceName')">
+                <if test="conditionParamRef.deviceName != null and conditionParamRef.deviceName != ''">
+                    ${_conditionType_} a.deviceName like #{${_conditionParam_}.deviceName}
+                </if>
+                <if test="conditionParamRef.deviceName == null">
+                    ${_conditionType_} a.deviceName is null
+                </if>
             </if>
-            <if test="conditionParamRef.deviceName == null">
-                ${_conditionType_} a.deviceName is null
+            <if test="conditionParamRef.containsKey('deviceNameList')">
+                ${_conditionType_} a.deviceName in
+                <foreach collection="conditionParamRef.deviceNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
             </if>
-        </if>
-        <if test="conditionParamRef.containsKey('deviceNameList')">
-            ${_conditionType_} a.deviceName in
-            <foreach collection="conditionParamRef.deviceNameList" open="(" close=")" index="index" item="item" separator=",">
-                #{item}
-            </foreach>
-        </if>
-        <if test="conditionParamRef.containsKey('logType')">
-            <if test="conditionParamRef.logType != null ">
-                ${_conditionType_} a.logType = #{${_conditionParam_}.logType}
+            <if test="conditionParamRef.containsKey('logType')">
+                <if test="conditionParamRef.logType != null ">
+                    ${_conditionType_} a.logType = #{${_conditionParam_}.logType}
+                </if>
+                <if test="conditionParamRef.logType == null">
+                    ${_conditionType_} a.logType is null
+                </if>
             </if>
-            <if test="conditionParamRef.logType == null">
-                ${_conditionType_} a.logType is null
+            <if test="conditionParamRef.containsKey('logTypeList')">
+                ${_conditionType_} a.logType in
+                <foreach collection="conditionParamRef.logTypeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('logTypeStart') and conditionParamRef.logTypeStart != null">
+                ${_conditionType_} a.logType <![CDATA[ >= ]]> #{${_conditionParam_}.logTypeStart}
+            </if>
+            <if test="conditionParamRef.containsKey('logTypeEnd') and conditionParamRef.logTypeEnd != null">
+                ${_conditionType_} a.logType <![CDATA[ <= ]]> #{${_conditionParam_}.logTypeEnd}
             </if>
-        </if>
-        <if test="conditionParamRef.containsKey('logTypeList')">
-            ${_conditionType_} a.logType in
-            <foreach collection="conditionParamRef.logTypeList" open="(" close=")" index="index" item="item" separator=",">
-                #{item}
-            </foreach>
-        </if>
-        <if test="conditionParamRef.containsKey('logTypeStart') and conditionParamRef.logTypeStart != null">
-            ${_conditionType_} a.logType <![CDATA[ >= ]]> #{${_conditionParam_}.logTypeStart}
-        </if>
-        <if test="conditionParamRef.containsKey('logTypeEnd') and conditionParamRef.logTypeEnd != null">
-            ${_conditionType_} a.logType <![CDATA[ <= ]]> #{${_conditionParam_}.logTypeEnd}
-        </if>
 
 
-        <if test="conditionParamRef.containsKey('content')">
-            <if test="conditionParamRef.content != null and conditionParamRef.content != ''">
-                ${_conditionType_} a.content like #{${_conditionParam_}.content}
+            <if test="conditionParamRef.containsKey('content')">
+                <if test="conditionParamRef.content != null and conditionParamRef.content != ''">
+                    ${_conditionType_} a.content like #{${_conditionParam_}.content}
+                </if>
+                <if test="conditionParamRef.content == null">
+                    ${_conditionType_} a.content is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('contentList')">
+                ${_conditionType_} a.content in
+                <foreach collection="conditionParamRef.contentList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
             </if>
-            <if test="conditionParamRef.content == null">
-                ${_conditionType_} a.content is null
+            <if test="conditionParamRef.containsKey('createUserId')">
+                <if test="conditionParamRef.createUserId != null ">
+                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+                </if>
+                <if test="conditionParamRef.createUserId == null">
+                    ${_conditionType_} a.createUserId is null
+                </if>
             </if>
-        </if>
-        <if test="conditionParamRef.containsKey('contentList')">
-            ${_conditionType_} a.content in
-            <foreach collection="conditionParamRef.contentList" open="(" close=")" index="index" item="item" separator=",">
-                #{item}
-            </foreach>
-        </if>
+            <if test="conditionParamRef.containsKey('createUserIdList')">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+                ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            </if>
+
 
-        <if test="conditionParamRef.containsKey('createTime')">
-            <if test="conditionParamRef.createTime != null ">
-                ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.createTime is null
+                </if>
             </if>
-            <if test="conditionParamRef.createTime == null">
-                ${_conditionType_} a.createTime is null
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserId')">
+                <if test="conditionParamRef.updateUserId != null ">
+                    ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
+                </if>
+                <if test="conditionParamRef.updateUserId == null">
+                    ${_conditionType_} a.updateUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdList')">
+                ${_conditionType_} a.updateUserId in
+                <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.updateTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
             </if>
-        </if>
-        <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
-            ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
-        </if>
-        <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
-            ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
-        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
             order by
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                    ${item.colName} ${item.sortKind}
+                     ${item.colName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>
         <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
             order by
             <trim suffixOverrides=","  suffix="">
-                <if test="orderCol.containsKey('id')">
-                    a.id
-                    <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
-                    ,
-                </if>
-                <if test="orderCol.containsKey('deviceId')">
-                    a.deviceId
-                    <if test='orderCol.deviceId != null and "DESC".equalsIgnoreCase(orderCol.deviceId)'>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('deviceName')">
-                    a.deviceName
-                    <if test='orderCol.deviceName != null and "DESC".equalsIgnoreCase(orderCol.deviceName)'>DESC</if>
-                    ,
-                </if>
-                <if test="orderCol.containsKey('logType')">
-                    a.logType
-                    <if test='orderCol.logType != null and "DESC".equalsIgnoreCase(orderCol.logType)'>DESC</if>
-                    ,
-                </if>
-                <if test="orderCol.containsKey('content')">
-                    a.content
-                    <if test='orderCol.content != null and "DESC".equalsIgnoreCase(orderCol.content)'>DESC</if>
-                    ,
-                </if>
-                <if test="orderCol.containsKey('createTime')">
-                    a.createTime
-                    <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
-                    ,
-                </if>
+                    <if test="orderCol.containsKey('id')">
+                        a.id
+                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('deviceId')">
+                        a.deviceId
+                        <if test='orderCol.deviceId != null and "DESC".equalsIgnoreCase(orderCol.deviceId)'>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('deviceName')">
+                        a.deviceName
+                        <if test='orderCol.deviceName != null and "DESC".equalsIgnoreCase(orderCol.deviceName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('logType')">
+                        a.logType
+                        <if test='orderCol.logType != null and "DESC".equalsIgnoreCase(orderCol.logType)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('content')">
+                        a.content
+                        <if test='orderCol.content != null and "DESC".equalsIgnoreCase(orderCol.content)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createUserId')">
+                        a.createUserId
+                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.createTime
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateUserId')">
+                        a.updateUserId
+                        <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.updateTime
+                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                        ,
+                    </if>
             </trim>
         </if>
     </sql>

device-manager/src/main/resources/sqlmap/module/device/DeviceMapper.xml

@@ -8,14 +8,18 @@
         <id  property="id" column="id" />
         <result property="deviceName" column="deviceName" />
         <result property="deviceCode" column="deviceCode" />
-        <result property="deviceType" column="deviceType" />
+        <result property="siteCode" column="siteCode" />
+        <result property="siteName" column="siteName" />
         <result property="deviceMac" column="deviceMac" />
+        <result property="platformId" column="platformId" />
+        <result property="platformName" column="platformName" />
+        <result property="productId" column="productId" />
+        <result property="productName" column="productName" />
+        <result property="deviceFirmId" column="deviceFirmId" />
+        <result property="deviceFirmname" column="deviceFirmname" />
         <result property="ip" column="ip" />
         <result property="centernum" column="centernum" />
         <result property="port" column="port" />
-        <result property="siteNum" column="siteNum" />
-        <result property="deviceFirmId" column="deviceFirmId" />
-        <result property="deviceFirmname" column="deviceFirmname" />
         <result property="deviceOnlineStatus" column="deviceOnlineStatus" />
         <result property="status" column="status" />
         <result property="active" column="active" />
@@ -42,23 +46,26 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceCode') or colPickMode == 1 and data.containsKey('deviceCode')))">
                 a.deviceCode,
             </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceType') or colPickMode == 1 and data.containsKey('deviceType')))">
-                a.deviceType,
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteCode') or colPickMode == 1 and data.containsKey('siteCode')))">
+                a.siteCode,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
+                a.siteName,
             </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceMac') or colPickMode == 1 and data.containsKey('deviceMac')))">
                 a.deviceMac,
             </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ip') or colPickMode == 1 and data.containsKey('ip')))">
-                a.ip,
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('platformId') or colPickMode == 1 and data.containsKey('platformId')))">
+                a.platformId,
             </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('centernum') or colPickMode == 1 and data.containsKey('centernum')))">
-                a.centernum,
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('platformName') or colPickMode == 1 and data.containsKey('platformName')))">
+                a.platformName,
             </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('port') or colPickMode == 1 and data.containsKey('port')))">
-                a.port,
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('productId') or colPickMode == 1 and data.containsKey('productId')))">
+                a.productId,
             </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteNum') or colPickMode == 1 and data.containsKey('siteNum')))">
-                a.siteNum,
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('productName') or colPickMode == 1 and data.containsKey('productName')))">
+                a.productName,
             </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceFirmId') or colPickMode == 1 and data.containsKey('deviceFirmId')))">
                 a.deviceFirmId,
@@ -66,6 +73,15 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceFirmname') or colPickMode == 1 and data.containsKey('deviceFirmname')))">
                 a.deviceFirmname,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ip') or colPickMode == 1 and data.containsKey('ip')))">
+                a.ip,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('centernum') or colPickMode == 1 and data.containsKey('centernum')))">
+                a.centernum,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('port') or colPickMode == 1 and data.containsKey('port')))">
+                a.port,
+            </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceOnlineStatus') or colPickMode == 1 and data.containsKey('deviceOnlineStatus')))">
                 a.deviceOnlineStatus,
             </if>
@@ -101,18 +117,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="DeviceEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_device
-        (deviceName,deviceCode,deviceType,deviceMac,ip,centernum,port,siteNum,deviceFirmId,deviceFirmname,deviceOnlineStatus,status,active,deviceRemark,onlineTime,offlineTime,createUserId,createTime,updateUserId,updateTime)
+        (deviceName,deviceCode,siteCode,siteName,deviceMac,platformId,platformName,productId,productName,deviceFirmId,deviceFirmname,ip,centernum,port,deviceOnlineStatus,status,active,deviceRemark,onlineTime,offlineTime,createUserId,createTime,updateUserId,updateTime)
         VALUES
-        (#{deviceName},#{deviceCode},#{deviceType},#{deviceMac},#{ip},#{centernum},#{port},#{siteNum},#{deviceFirmId},#{deviceFirmname},#{deviceOnlineStatus},#{status},#{active},#{deviceRemark},#{onlineTime},#{offlineTime},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{deviceName},#{deviceCode},#{siteCode},#{siteName},#{deviceMac},#{platformId},#{platformName},#{productId},#{productName},#{deviceFirmId},#{deviceFirmname},#{ip},#{centernum},#{port},#{deviceOnlineStatus},#{status},#{active},#{deviceRemark},#{onlineTime},#{offlineTime},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_device
-        (deviceName,deviceCode,deviceType,deviceMac,ip,centernum,port,siteNum,deviceFirmId,deviceFirmname,deviceOnlineStatus,status,active,deviceRemark,onlineTime,offlineTime,createUserId,createTime,updateUserId,updateTime)
+        (deviceName,deviceCode,siteCode,siteName,deviceMac,platformId,platformName,productId,productName,deviceFirmId,deviceFirmname,ip,centernum,port,deviceOnlineStatus,status,active,deviceRemark,onlineTime,offlineTime,createUserId,createTime,updateUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.deviceName},#{item.deviceCode},#{item.deviceType},#{item.deviceMac},#{item.ip},#{item.centernum},#{item.port},#{item.siteNum},#{item.deviceFirmId},#{item.deviceFirmname},#{item.deviceOnlineStatus},#{item.status},#{item.active},#{item.deviceRemark},#{item.onlineTime},#{item.offlineTime},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.deviceName},#{item.deviceCode},#{item.siteCode},#{item.siteName},#{item.deviceMac},#{item.platformId},#{item.platformName},#{item.productId},#{item.productName},#{item.deviceFirmId},#{item.deviceFirmname},#{item.ip},#{item.centernum},#{item.port},#{item.deviceOnlineStatus},#{item.status},#{item.active},#{item.deviceRemark},#{item.onlineTime},#{item.offlineTime},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -128,26 +144,32 @@
             <if test="(colPickMode==0 and data.containsKey('deviceCode')) or (colPickMode==1 and !data.containsKey('deviceCode'))">
                 a.deviceCode=#{data.deviceCode},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('deviceType')) or (colPickMode==1 and !data.containsKey('deviceType'))">
-                a.deviceType=#{data.deviceType},
+            <if test="(colPickMode==0 and data.containsKey('siteCode')) or (colPickMode==1 and !data.containsKey('siteCode'))">
+                a.siteCode=#{data.siteCode},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('deviceTypeIncrement')) or (colPickMode==1 and !data.containsKey('deviceTypeIncrement'))">
-                a.deviceType=ifnull(a.deviceType,0) + #{data.deviceTypeIncrement},
+            <if test="(colPickMode==0 and data.containsKey('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))">
+                a.siteName=#{data.siteName},
             </if>
             <if test="(colPickMode==0 and data.containsKey('deviceMac')) or (colPickMode==1 and !data.containsKey('deviceMac'))">
                 a.deviceMac=#{data.deviceMac},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('ip')) or (colPickMode==1 and !data.containsKey('ip'))">
-                a.ip=#{data.ip},
+            <if test="(colPickMode==0 and data.containsKey('platformId')) or (colPickMode==1 and !data.containsKey('platformId'))">
+                a.platformId=#{data.platformId},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('centernum')) or (colPickMode==1 and !data.containsKey('centernum'))">
-                a.centernum=#{data.centernum},
+            <if test="(colPickMode==0 and data.containsKey('platformIdIncrement')) or (colPickMode==1 and !data.containsKey('platformIdIncrement'))">
+                a.platformId=ifnull(a.platformId,0) + #{data.platformIdIncrement},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('port')) or (colPickMode==1 and !data.containsKey('port'))">
-                a.port=#{data.port},
+            <if test="(colPickMode==0 and data.containsKey('platformName')) or (colPickMode==1 and !data.containsKey('platformName'))">
+                a.platformName=#{data.platformName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('productId')) or (colPickMode==1 and !data.containsKey('productId'))">
+                a.productId=#{data.productId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('productIdIncrement')) or (colPickMode==1 and !data.containsKey('productIdIncrement'))">
+                a.productId=ifnull(a.productId,0) + #{data.productIdIncrement},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('siteNum')) or (colPickMode==1 and !data.containsKey('siteNum'))">
-                a.siteNum=#{data.siteNum},
+            <if test="(colPickMode==0 and data.containsKey('productName')) or (colPickMode==1 and !data.containsKey('productName'))">
+                a.productName=#{data.productName},
             </if>
             <if test="(colPickMode==0 and data.containsKey('deviceFirmId')) or (colPickMode==1 and !data.containsKey('deviceFirmId'))">
                 a.deviceFirmId=#{data.deviceFirmId},
@@ -158,6 +180,15 @@
             <if test="(colPickMode==0 and data.containsKey('deviceFirmname')) or (colPickMode==1 and !data.containsKey('deviceFirmname'))">
                 a.deviceFirmname=#{data.deviceFirmname},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('ip')) or (colPickMode==1 and !data.containsKey('ip'))">
+                a.ip=#{data.ip},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('centernum')) or (colPickMode==1 and !data.containsKey('centernum'))">
+                a.centernum=#{data.centernum},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('port')) or (colPickMode==1 and !data.containsKey('port'))">
+                a.port=#{data.port},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('deviceOnlineStatus')) or (colPickMode==1 and !data.containsKey('deviceOnlineStatus'))">
                 a.deviceOnlineStatus=#{data.deviceOnlineStatus},
             </if>
@@ -229,16 +260,18 @@
                     </if>
                 </foreach>
             </trim>
-            <trim prefix="deviceType=(case" suffix="ELSE deviceType end),">
+            <trim prefix="siteCode=(case" suffix="ELSE siteCode end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <choose>
-                        <when test="(colPickMode==0 and item.containsKey('deviceType')) or (colPickMode==1 and !item.containsKey('deviceType'))">
-                            when a.id=#{item.id} then #{item.deviceType}
-                        </when>
-                        <when test="(colPickMode==0 and item.containsKey('deviceTypeIncrement')) or (colPickMode==1 and !item.containsKey('deviceTypeIncrement'))">
-                            when a.id=#{item.id} then ifnull(a.deviceType,0) + #{item.deviceTypeIncrement}
-                        </when>
-                    </choose>
+                    <if test="(colPickMode==0 and item.containsKey('siteCode')) or (colPickMode==1 and !item.containsKey('siteCode'))">
+                        when a.id=#{item.id} then #{item.siteCode}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="siteName=(case" suffix="ELSE siteName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('siteName')) or (colPickMode==1 and !item.containsKey('siteName'))">
+                        when a.id=#{item.id} then #{item.siteName}
+                    </if>
                 </foreach>
             </trim>
             <trim prefix="deviceMac=(case" suffix="ELSE deviceMac end),">
@@ -248,31 +281,41 @@
                     </if>
                 </foreach>
             </trim>
-            <trim prefix="ip=(case" suffix="ELSE ip end),">
+            <trim prefix="platformId=(case" suffix="ELSE platformId end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('ip')) or (colPickMode==1 and !item.containsKey('ip'))">
-                        when a.id=#{item.id} then #{item.ip}
-                    </if>
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('platformId')) or (colPickMode==1 and !item.containsKey('platformId'))">
+                            when a.id=#{item.id} then #{item.platformId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('platformIdIncrement')) or (colPickMode==1 and !item.containsKey('platformIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.platformId,0) + #{item.platformIdIncrement}
+                        </when>
+                    </choose>
                 </foreach>
             </trim>
-            <trim prefix="centernum=(case" suffix="ELSE centernum end),">
+            <trim prefix="platformName=(case" suffix="ELSE platformName end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('centernum')) or (colPickMode==1 and !item.containsKey('centernum'))">
-                        when a.id=#{item.id} then #{item.centernum}
+                    <if test="(colPickMode==0 and item.containsKey('platformName')) or (colPickMode==1 and !item.containsKey('platformName'))">
+                        when a.id=#{item.id} then #{item.platformName}
                     </if>
                 </foreach>
             </trim>
-            <trim prefix="port=(case" suffix="ELSE port end),">
+            <trim prefix="productId=(case" suffix="ELSE productId end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('port')) or (colPickMode==1 and !item.containsKey('port'))">
-                        when a.id=#{item.id} then #{item.port}
-                    </if>
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('productId')) or (colPickMode==1 and !item.containsKey('productId'))">
+                            when a.id=#{item.id} then #{item.productId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('productIdIncrement')) or (colPickMode==1 and !item.containsKey('productIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.productId,0) + #{item.productIdIncrement}
+                        </when>
+                    </choose>
                 </foreach>
             </trim>
-            <trim prefix="siteNum=(case" suffix="ELSE siteNum end),">
+            <trim prefix="productName=(case" suffix="ELSE productName end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('siteNum')) or (colPickMode==1 and !item.containsKey('siteNum'))">
-                        when a.id=#{item.id} then #{item.siteNum}
+                    <if test="(colPickMode==0 and item.containsKey('productName')) or (colPickMode==1 and !item.containsKey('productName'))">
+                        when a.id=#{item.id} then #{item.productName}
                     </if>
                 </foreach>
             </trim>
@@ -295,6 +338,27 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="ip=(case" suffix="ELSE ip end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('ip')) or (colPickMode==1 and !item.containsKey('ip'))">
+                        when a.id=#{item.id} then #{item.ip}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="centernum=(case" suffix="ELSE centernum end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('centernum')) or (colPickMode==1 and !item.containsKey('centernum'))">
+                        when a.id=#{item.id} then #{item.centernum}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="port=(case" suffix="ELSE port end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('port')) or (colPickMode==1 and !item.containsKey('port'))">
+                        when a.id=#{item.id} then #{item.port}
+                    </if>
+                </foreach>
+            </trim>
             <trim prefix="deviceOnlineStatus=(case" suffix="ELSE deviceOnlineStatus end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
                     <choose>
@@ -542,28 +606,37 @@
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('deviceType')">
-            <if test="conditionParamRef.deviceType != null ">
-                ${_conditionType_} a.deviceType = #{${_conditionParam_}.deviceType}
+
+        <if test="conditionParamRef.containsKey('siteCode')">
+            <if test="conditionParamRef.siteCode != null and conditionParamRef.siteCode != ''">
+                ${_conditionType_} a.siteCode like #{${_conditionParam_}.siteCode}
             </if>
-            <if test="conditionParamRef.deviceType == null">
-                ${_conditionType_} a.deviceType is null
+            <if test="conditionParamRef.siteCode == null">
+                ${_conditionType_} a.siteCode is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('deviceTypeList')">
-            ${_conditionType_} a.deviceType in
-            <foreach collection="conditionParamRef.deviceTypeList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('siteCodeList')">
+            ${_conditionType_} a.siteCode in
+            <foreach collection="conditionParamRef.siteCodeList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('deviceTypeStart') and conditionParamRef.deviceTypeStart != null">
-            ${_conditionType_} a.deviceType <![CDATA[ >= ]]> #{${_conditionParam_}.deviceTypeStart}
+
+        <if test="conditionParamRef.containsKey('siteName')">
+            <if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
+                ${_conditionType_} a.siteName like #{${_conditionParam_}.siteName}
+            </if>
+            <if test="conditionParamRef.siteName == null">
+                ${_conditionType_} a.siteName is null
+            </if>
         </if>
-        <if test="conditionParamRef.containsKey('deviceTypeEnd') and conditionParamRef.deviceTypeEnd != null">
-            ${_conditionType_} a.deviceType <![CDATA[ <= ]]> #{${_conditionParam_}.deviceTypeEnd}
+        <if test="conditionParamRef.containsKey('siteNameList')">
+            ${_conditionType_} a.siteName in
+            <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
         </if>
 
-
         <if test="conditionParamRef.containsKey('deviceMac')">
             <if test="conditionParamRef.deviceMac != null and conditionParamRef.deviceMac != ''">
                 ${_conditionType_} a.deviceMac like #{${_conditionParam_}.deviceMac}
@@ -578,63 +651,75 @@
                 #{item}
             </foreach>
         </if>
-
-        <if test="conditionParamRef.containsKey('ip')">
-            <if test="conditionParamRef.ip != null and conditionParamRef.ip != ''">
-                ${_conditionType_} a.ip like #{${_conditionParam_}.ip}
+        <if test="conditionParamRef.containsKey('platformId')">
+            <if test="conditionParamRef.platformId != null ">
+                ${_conditionType_} a.platformId = #{${_conditionParam_}.platformId}
             </if>
-            <if test="conditionParamRef.ip == null">
-                ${_conditionType_} a.ip is null
+            <if test="conditionParamRef.platformId == null">
+                ${_conditionType_} a.platformId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('ipList')">
-            ${_conditionType_} a.ip in
-            <foreach collection="conditionParamRef.ipList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('platformIdList')">
+            ${_conditionType_} a.platformId in
+            <foreach collection="conditionParamRef.platformIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('platformIdStart') and conditionParamRef.platformIdStart != null">
+            ${_conditionType_} a.platformId <![CDATA[ >= ]]> #{${_conditionParam_}.platformIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('platformIdEnd') and conditionParamRef.platformIdEnd != null">
+            ${_conditionType_} a.platformId <![CDATA[ <= ]]> #{${_conditionParam_}.platformIdEnd}
+        </if>
 
-        <if test="conditionParamRef.containsKey('centernum')">
-            <if test="conditionParamRef.centernum != null and conditionParamRef.centernum != ''">
-                ${_conditionType_} a.centernum like #{${_conditionParam_}.centernum}
+
+        <if test="conditionParamRef.containsKey('platformName')">
+            <if test="conditionParamRef.platformName != null and conditionParamRef.platformName != ''">
+                ${_conditionType_} a.platformName like #{${_conditionParam_}.platformName}
             </if>
-            <if test="conditionParamRef.centernum == null">
-                ${_conditionType_} a.centernum is null
+            <if test="conditionParamRef.platformName == null">
+                ${_conditionType_} a.platformName is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('centernumList')">
-            ${_conditionType_} a.centernum in
-            <foreach collection="conditionParamRef.centernumList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('platformNameList')">
+            ${_conditionType_} a.platformName in
+            <foreach collection="conditionParamRef.platformNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-
-        <if test="conditionParamRef.containsKey('port')">
-            <if test="conditionParamRef.port != null and conditionParamRef.port != ''">
-                ${_conditionType_} a.port like #{${_conditionParam_}.port}
+        <if test="conditionParamRef.containsKey('productId')">
+            <if test="conditionParamRef.productId != null ">
+                ${_conditionType_} a.productId = #{${_conditionParam_}.productId}
             </if>
-            <if test="conditionParamRef.port == null">
-                ${_conditionType_} a.port is null
+            <if test="conditionParamRef.productId == null">
+                ${_conditionType_} a.productId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('portList')">
-            ${_conditionType_} a.port in
-            <foreach collection="conditionParamRef.portList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('productIdList')">
+            ${_conditionType_} a.productId in
+            <foreach collection="conditionParamRef.productIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('productIdStart') and conditionParamRef.productIdStart != null">
+            ${_conditionType_} a.productId <![CDATA[ >= ]]> #{${_conditionParam_}.productIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('productIdEnd') and conditionParamRef.productIdEnd != null">
+            ${_conditionType_} a.productId <![CDATA[ <= ]]> #{${_conditionParam_}.productIdEnd}
+        </if>
+
 
-        <if test="conditionParamRef.containsKey('siteNum')">
-            <if test="conditionParamRef.siteNum != null and conditionParamRef.siteNum != ''">
-                ${_conditionType_} a.siteNum like #{${_conditionParam_}.siteNum}
+        <if test="conditionParamRef.containsKey('productName')">
+            <if test="conditionParamRef.productName != null and conditionParamRef.productName != ''">
+                ${_conditionType_} a.productName like #{${_conditionParam_}.productName}
             </if>
-            <if test="conditionParamRef.siteNum == null">
-                ${_conditionType_} a.siteNum is null
+            <if test="conditionParamRef.productName == null">
+                ${_conditionType_} a.productName is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('siteNumList')">
-            ${_conditionType_} a.siteNum in
-            <foreach collection="conditionParamRef.siteNumList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('productNameList')">
+            ${_conditionType_} a.productName in
+            <foreach collection="conditionParamRef.productNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
@@ -674,6 +759,51 @@
                 #{item}
             </foreach>
         </if>
+
+        <if test="conditionParamRef.containsKey('ip')">
+            <if test="conditionParamRef.ip != null and conditionParamRef.ip != ''">
+                ${_conditionType_} a.ip like #{${_conditionParam_}.ip}
+            </if>
+            <if test="conditionParamRef.ip == null">
+                ${_conditionType_} a.ip is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('ipList')">
+            ${_conditionType_} a.ip in
+            <foreach collection="conditionParamRef.ipList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('centernum')">
+            <if test="conditionParamRef.centernum != null and conditionParamRef.centernum != ''">
+                ${_conditionType_} a.centernum like #{${_conditionParam_}.centernum}
+            </if>
+            <if test="conditionParamRef.centernum == null">
+                ${_conditionType_} a.centernum is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('centernumList')">
+            ${_conditionType_} a.centernum in
+            <foreach collection="conditionParamRef.centernumList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('port')">
+            <if test="conditionParamRef.port != null and conditionParamRef.port != ''">
+                ${_conditionType_} a.port like #{${_conditionParam_}.port}
+            </if>
+            <if test="conditionParamRef.port == null">
+                ${_conditionType_} a.port is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('portList')">
+            ${_conditionType_} a.port in
+            <foreach collection="conditionParamRef.portList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('deviceOnlineStatus')">
             <if test="conditionParamRef.deviceOnlineStatus != null ">
                 ${_conditionType_} a.deviceOnlineStatus = #{${_conditionParam_}.deviceOnlineStatus}
@@ -882,9 +1012,14 @@
                     <if test='orderCol.deviceCode != null and "DESC".equalsIgnoreCase(orderCol.deviceCode)'>DESC</if>
                     ,
                 </if>
-                <if test="orderCol.containsKey('deviceType')">
-                    a.deviceType
-                    <if test='orderCol.deviceType != null and "DESC".equalsIgnoreCase(orderCol.deviceType)'>DESC</if>
+                <if test="orderCol.containsKey('siteCode')">
+                    a.siteCode
+                    <if test='orderCol.siteCode != null and "DESC".equalsIgnoreCase(orderCol.siteCode)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('siteName')">
+                    a.siteName
+                    <if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
                     ,
                 </if>
                 <if test="orderCol.containsKey('deviceMac')">
@@ -892,24 +1027,24 @@
                     <if test='orderCol.deviceMac != null and "DESC".equalsIgnoreCase(orderCol.deviceMac)'>DESC</if>
                     ,
                 </if>
-                <if test="orderCol.containsKey('ip')">
-                    a.ip
-                    <if test='orderCol.ip != null and "DESC".equalsIgnoreCase(orderCol.ip)'>DESC</if>
+                <if test="orderCol.containsKey('platformId')">
+                    a.platformId
+                    <if test='orderCol.platformId != null and "DESC".equalsIgnoreCase(orderCol.platformId)'>DESC</if>
                     ,
                 </if>
-                <if test="orderCol.containsKey('centernum')">
-                    a.centernum
-                    <if test='orderCol.centernum != null and "DESC".equalsIgnoreCase(orderCol.centernum)'>DESC</if>
+                <if test="orderCol.containsKey('platformName')">
+                    a.platformName
+                    <if test='orderCol.platformName != null and "DESC".equalsIgnoreCase(orderCol.platformName)'>DESC</if>
                     ,
                 </if>
-                <if test="orderCol.containsKey('port')">
-                    a.port
-                    <if test='orderCol.port != null and "DESC".equalsIgnoreCase(orderCol.port)'>DESC</if>
+                <if test="orderCol.containsKey('productId')">
+                    a.productId
+                    <if test='orderCol.productId != null and "DESC".equalsIgnoreCase(orderCol.productId)'>DESC</if>
                     ,
                 </if>
-                <if test="orderCol.containsKey('siteNum')">
-                    a.siteNum
-                    <if test='orderCol.siteNum != null and "DESC".equalsIgnoreCase(orderCol.siteNum)'>DESC</if>
+                <if test="orderCol.containsKey('productName')">
+                    a.productName
+                    <if test='orderCol.productName != null and "DESC".equalsIgnoreCase(orderCol.productName)'>DESC</if>
                     ,
                 </if>
                 <if test="orderCol.containsKey('deviceFirmId')">
@@ -922,6 +1057,21 @@
                     <if test='orderCol.deviceFirmname != null and "DESC".equalsIgnoreCase(orderCol.deviceFirmname)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('ip')">
+                    a.ip
+                    <if test='orderCol.ip != null and "DESC".equalsIgnoreCase(orderCol.ip)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('centernum')">
+                    a.centernum
+                    <if test='orderCol.centernum != null and "DESC".equalsIgnoreCase(orderCol.centernum)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('port')">
+                    a.port
+                    <if test='orderCol.port != null and "DESC".equalsIgnoreCase(orderCol.port)'>DESC</if>
+                    ,
+                </if>
                 <if test="orderCol.containsKey('deviceOnlineStatus')">
                     a.deviceOnlineStatus
                     <if test='orderCol.deviceOnlineStatus != null and "DESC".equalsIgnoreCase(orderCol.deviceOnlineStatus)'>DESC</if>

device-manager/src/main/resources/sqlmap/module/firm/FirmMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "mybatis-3-mapper.dtd">
+"mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.firm.dao.ibatis.FirmDaoImpl">
 
     <!-- 字段和属性映射 -->
     <resultMap type="FirmEntity" id="FirmEntity-Map">
-        <id  property="id" column="id" />
-        <result property="firmName" column="firmName" />
-        <result property="firmCode" column="firmCode" />
-        <result property="firmRemark" column="firmRemark" />
-        <result property="createUserId" column="createUserId" />
-        <result property="createTime" column="createTime" />
-        <result property="updateUserId" column="updateUserId" />
-        <result property="updateTime" column="updateTime" />
-
+            <id  property="id" column="id" />
+            <result property="firmName" column="firmName" />
+            <result property="firmCode" column="firmCode" />
+            <result property="firmRemark" column="firmRemark" />
+            <result property="createUserId" column="createUserId" />
+            <result property="createTime" column="createTime" />
+            <result property="updateUserId" column="updateUserId" />
+            <result property="updateTime" column="updateTime" />
+            
     </resultMap>
 
 
     <!-- 表所有列 -->
     <sql id="_columns">
         <trim suffixOverrides="," suffix="">
-            <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('firmName') or colPickMode == 1 and data.containsKey('firmName')))">
-                a.firmName,
-            </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('firmCode') or colPickMode == 1 and data.containsKey('firmCode')))">
-                a.firmCode,
-            </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('firmRemark') or colPickMode == 1 and data.containsKey('firmRemark')))">
-                a.firmRemark,
-            </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
-                a.createUserId,
-            </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
-                a.createTime,
-            </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
-                a.updateUserId,
-            </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
-                a.updateTime,
-            </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                    a.id,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('firmName') or colPickMode == 1 and data.containsKey('firmName')))">
+                    a.firmName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('firmCode') or colPickMode == 1 and data.containsKey('firmCode')))">
+                    a.firmCode,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('firmRemark') or colPickMode == 1 and data.containsKey('firmRemark')))">
+                    a.firmRemark,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                    a.createUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.createTime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
+                    a.updateUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                    a.updateTime,
+                </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
@@ -109,65 +109,65 @@
     <update id="updateBatch" parameterType="paramDto">
         update mortals_xhx_firm as a
         <trim prefix="set" suffixOverrides=",">
-            <trim prefix="firmName=(case" suffix="ELSE firmName end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('firmName')) or (colPickMode==1 and !item.containsKey('firmName'))">
-                        when a.id=#{item.id} then #{item.firmName}
-                    </if>
-                </foreach>
-            </trim>
-            <trim prefix="firmCode=(case" suffix="ELSE firmCode end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('firmCode')) or (colPickMode==1 and !item.containsKey('firmCode'))">
-                        when a.id=#{item.id} then #{item.firmCode}
-                    </if>
-                </foreach>
-            </trim>
-            <trim prefix="firmRemark=(case" suffix="ELSE firmRemark end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('firmRemark')) or (colPickMode==1 and !item.containsKey('firmRemark'))">
-                        when a.id=#{item.id} then #{item.firmRemark}
-                    </if>
-                </foreach>
-            </trim>
-            <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <choose>
-                        <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
-                            when a.id=#{item.id} then #{item.createUserId}
-                        </when>
-                        <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
-                            when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
-                        </when>
-                    </choose>
-                </foreach>
-            </trim>
-            <trim prefix="createTime=(case" suffix="ELSE createTime end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
-                        when a.id=#{item.id} then #{item.createTime}
-                    </if>
-                </foreach>
-            </trim>
-            <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <choose>
-                        <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
-                            when a.id=#{item.id} then #{item.updateUserId}
-                        </when>
-                        <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
-                            when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
-                        </when>
-                    </choose>
-                </foreach>
-            </trim>
-            <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
-                        when a.id=#{item.id} then #{item.updateTime}
-                    </if>
-                </foreach>
-            </trim>
+                <trim prefix="firmName=(case" suffix="ELSE firmName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('firmName')) or (colPickMode==1 and !item.containsKey('firmName'))">
+                            when a.id=#{item.id} then #{item.firmName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="firmCode=(case" suffix="ELSE firmCode end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('firmCode')) or (colPickMode==1 and !item.containsKey('firmCode'))">
+                            when a.id=#{item.id} then #{item.firmCode}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="firmRemark=(case" suffix="ELSE firmRemark end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('firmRemark')) or (colPickMode==1 and !item.containsKey('firmRemark'))">
+                            when a.id=#{item.id} then #{item.firmRemark}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                                        when a.id=#{item.id} then #{item.createUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                            when a.id=#{item.id} then #{item.createTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
+                                        when a.id=#{item.id} then #{item.updateUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                            when a.id=#{item.id} then #{item.updateTime}
+                        </if>
+                    </foreach>
+                </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -269,197 +269,197 @@
                 ${_conditionType_} a.id=#{${_conditionParam_}.id}
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('id')">
-            <if test="conditionParamRef.id != null ">
-                ${_conditionType_} a.id = #{${_conditionParam_}.id}
+            <if test="conditionParamRef.containsKey('id')">
+                <if test="conditionParamRef.id != null ">
+                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
+                </if>
+                <if test="conditionParamRef.id == null">
+                    ${_conditionType_} a.id is null
+                </if>
             </if>
-            <if test="conditionParamRef.id == null">
-                ${_conditionType_} a.id is null
+            <if test="conditionParamRef.containsKey('idList')">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+                ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+            </if>
+            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
             </if>
-        </if>
-        <if test="conditionParamRef.containsKey('idList')">
-            ${_conditionType_} a.id in
-            <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
-                #{item}
-            </foreach>
-        </if>
-        <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
-            ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
-        </if>
-        <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
-            ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
-        </if>
 
 
-        <if test="conditionParamRef.containsKey('firmName')">
-            <if test="conditionParamRef.firmName != null and conditionParamRef.firmName != ''">
-                ${_conditionType_} a.firmName like #{${_conditionParam_}.firmName}
+            <if test="conditionParamRef.containsKey('firmName')">
+                <if test="conditionParamRef.firmName != null and conditionParamRef.firmName != ''">
+                    ${_conditionType_} a.firmName like #{${_conditionParam_}.firmName}
+                </if>
+                <if test="conditionParamRef.firmName == null">
+                    ${_conditionType_} a.firmName is null
+                </if>
             </if>
-            <if test="conditionParamRef.firmName == null">
-                ${_conditionType_} a.firmName is null
+            <if test="conditionParamRef.containsKey('firmNameList')">
+                ${_conditionType_} a.firmName in
+                <foreach collection="conditionParamRef.firmNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
             </if>
-        </if>
-        <if test="conditionParamRef.containsKey('firmNameList')">
-            ${_conditionType_} a.firmName in
-            <foreach collection="conditionParamRef.firmNameList" open="(" close=")" index="index" item="item" separator=",">
-                #{item}
-            </foreach>
-        </if>
 
-        <if test="conditionParamRef.containsKey('firmCode')">
-            <if test="conditionParamRef.firmCode != null and conditionParamRef.firmCode != ''">
-                ${_conditionType_} a.firmCode like #{${_conditionParam_}.firmCode}
+            <if test="conditionParamRef.containsKey('firmCode')">
+                <if test="conditionParamRef.firmCode != null and conditionParamRef.firmCode != ''">
+                    ${_conditionType_} a.firmCode like #{${_conditionParam_}.firmCode}
+                </if>
+                <if test="conditionParamRef.firmCode == null">
+                    ${_conditionType_} a.firmCode is null
+                </if>
             </if>
-            <if test="conditionParamRef.firmCode == null">
-                ${_conditionType_} a.firmCode is null
+            <if test="conditionParamRef.containsKey('firmCodeList')">
+                ${_conditionType_} a.firmCode in
+                <foreach collection="conditionParamRef.firmCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
             </if>
-        </if>
-        <if test="conditionParamRef.containsKey('firmCodeList')">
-            ${_conditionType_} a.firmCode in
-            <foreach collection="conditionParamRef.firmCodeList" open="(" close=")" index="index" item="item" separator=",">
-                #{item}
-            </foreach>
-        </if>
 
-        <if test="conditionParamRef.containsKey('firmRemark')">
-            <if test="conditionParamRef.firmRemark != null and conditionParamRef.firmRemark != ''">
-                ${_conditionType_} a.firmRemark like #{${_conditionParam_}.firmRemark}
+            <if test="conditionParamRef.containsKey('firmRemark')">
+                <if test="conditionParamRef.firmRemark != null and conditionParamRef.firmRemark != ''">
+                    ${_conditionType_} a.firmRemark like #{${_conditionParam_}.firmRemark}
+                </if>
+                <if test="conditionParamRef.firmRemark == null">
+                    ${_conditionType_} a.firmRemark is null
+                </if>
             </if>
-            <if test="conditionParamRef.firmRemark == null">
-                ${_conditionType_} a.firmRemark is null
+            <if test="conditionParamRef.containsKey('firmRemarkList')">
+                ${_conditionType_} a.firmRemark in
+                <foreach collection="conditionParamRef.firmRemarkList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
             </if>
-        </if>
-        <if test="conditionParamRef.containsKey('firmRemarkList')">
-            ${_conditionType_} a.firmRemark in
-            <foreach collection="conditionParamRef.firmRemarkList" open="(" close=")" index="index" item="item" separator=",">
-                #{item}
-            </foreach>
-        </if>
-        <if test="conditionParamRef.containsKey('createUserId')">
-            <if test="conditionParamRef.createUserId != null ">
-                ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+            <if test="conditionParamRef.containsKey('createUserId')">
+                <if test="conditionParamRef.createUserId != null ">
+                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+                </if>
+                <if test="conditionParamRef.createUserId == null">
+                    ${_conditionType_} a.createUserId is null
+                </if>
             </if>
-            <if test="conditionParamRef.createUserId == null">
-                ${_conditionType_} a.createUserId is null
+            <if test="conditionParamRef.containsKey('createUserIdList')">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+                ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
             </if>
-        </if>
-        <if test="conditionParamRef.containsKey('createUserIdList')">
-            ${_conditionType_} a.createUserId in
-            <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
-                #{item}
-            </foreach>
-        </if>
-        <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
-            ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
-        </if>
-        <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
-            ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
-        </if>
 
 
-        <if test="conditionParamRef.containsKey('createTime')">
-            <if test="conditionParamRef.createTime != null ">
-                ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.createTime is null
+                </if>
             </if>
-            <if test="conditionParamRef.createTime == null">
-                ${_conditionType_} a.createTime is null
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
             </if>
-        </if>
-        <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
-            ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
-        </if>
-        <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
-            ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
-        </if>
-        <if test="conditionParamRef.containsKey('updateUserId')">
-            <if test="conditionParamRef.updateUserId != null ">
-                ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
+            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
             </if>
-            <if test="conditionParamRef.updateUserId == null">
-                ${_conditionType_} a.updateUserId is null
+            <if test="conditionParamRef.containsKey('updateUserId')">
+                <if test="conditionParamRef.updateUserId != null ">
+                    ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
+                </if>
+                <if test="conditionParamRef.updateUserId == null">
+                    ${_conditionType_} a.updateUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdList')">
+                ${_conditionType_} a.updateUserId in
+                <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
             </if>
-        </if>
-        <if test="conditionParamRef.containsKey('updateUserIdList')">
-            ${_conditionType_} a.updateUserId in
-            <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
-                #{item}
-            </foreach>
-        </if>
-        <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
-            ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
-        </if>
-        <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
-            ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
-        </if>
 
 
-        <if test="conditionParamRef.containsKey('updateTime')">
-            <if test="conditionParamRef.updateTime != null ">
-                ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.updateTime is null
+                </if>
             </if>
-            <if test="conditionParamRef.updateTime == null">
-                ${_conditionType_} a.updateTime is null
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
             </if>
-        </if>
-        <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
-            ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
-        </if>
-        <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
-            ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
-        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
             order by
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                    ${item.colName} ${item.sortKind}
+                     ${item.colName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>
         <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
             order by
             <trim suffixOverrides=","  suffix="">
-                <if test="orderCol.containsKey('id')">
-                    a.id
-                    <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
-                    ,
-                </if>
-                <if test="orderCol.containsKey('firmName')">
-                    a.firmName
-                    <if test='orderCol.firmName != null and "DESC".equalsIgnoreCase(orderCol.firmName)'>DESC</if>
-                    ,
-                </if>
-                <if test="orderCol.containsKey('firmCode')">
-                    a.firmCode
-                    <if test='orderCol.firmCode != null and "DESC".equalsIgnoreCase(orderCol.firmCode)'>DESC</if>
-                    ,
-                </if>
-                <if test="orderCol.containsKey('firmRemark')">
-                    a.firmRemark
-                    <if test='orderCol.firmRemark != null and "DESC".equalsIgnoreCase(orderCol.firmRemark)'>DESC</if>
-                    ,
-                </if>
-                <if test="orderCol.containsKey('createUserId')">
-                    a.createUserId
-                    <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
-                    ,
-                </if>
-                <if test="orderCol.containsKey('createTime')">
-                    a.createTime
-                    <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
-                    ,
-                </if>
-                <if test="orderCol.containsKey('updateUserId')">
-                    a.updateUserId
-                    <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
-                    ,
-                </if>
-                <if test="orderCol.containsKey('updateTime')">
-                    a.updateTime
-                    <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
-                    ,
-                </if>
+                    <if test="orderCol.containsKey('id')">
+                        a.id
+                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('firmName')">
+                        a.firmName
+                        <if test='orderCol.firmName != null and "DESC".equalsIgnoreCase(orderCol.firmName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('firmCode')">
+                        a.firmCode
+                        <if test='orderCol.firmCode != null and "DESC".equalsIgnoreCase(orderCol.firmCode)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('firmRemark')">
+                        a.firmRemark
+                        <if test='orderCol.firmRemark != null and "DESC".equalsIgnoreCase(orderCol.firmRemark)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createUserId')">
+                        a.createUserId
+                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.createTime
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateUserId')">
+                        a.updateUserId
+                        <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.updateTime
+                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                        ,
+                    </if>
             </trim>
         </if>
     </sql>

device-manager/src/main/resources/sqlmap/module/platform/PlatformMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.platform.dao.ibatis.PlatformDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="PlatformEntity" id="PlatformEntity-Map">
+            <id  property="id" column="id" />
+            <result property="platformName" column="platformName" />
+            <result property="platformSn" column="platformSn" />
+            <result property="sendMsgType" column="sendMsgType" />
+            <result property="sendConfig" column="sendConfig" />
+            <result property="sendSwitch" column="sendSwitch" />
+            <result property="platformRemark" column="platformRemark" />
+            <result property="createUserId" column="createUserId" />
+            <result property="createTime" column="createTime" />
+            <result property="updateUserId" column="updateUserId" />
+            <result property="updateTime" column="updateTime" />
+            
+    </resultMap>
+
+
+    <!-- 表所有列 -->
+    <sql id="_columns">
+        <trim suffixOverrides="," suffix="">
+                <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('platformName') or colPickMode == 1 and data.containsKey('platformName')))">
+                    a.platformName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('platformSn') or colPickMode == 1 and data.containsKey('platformSn')))">
+                    a.platformSn,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sendMsgType') or colPickMode == 1 and data.containsKey('sendMsgType')))">
+                    a.sendMsgType,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sendConfig') or colPickMode == 1 and data.containsKey('sendConfig')))">
+                    a.sendConfig,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sendSwitch') or colPickMode == 1 and data.containsKey('sendSwitch')))">
+                    a.sendSwitch,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('platformRemark') or colPickMode == 1 and data.containsKey('platformRemark')))">
+                    a.platformRemark,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                    a.createUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.createTime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
+                    a.updateUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                    a.updateTime,
+                </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="PlatformEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_platform
+        (platformName,platformSn,sendMsgType,sendConfig,sendSwitch,platformRemark,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        (#{platformName},#{platformSn},#{sendMsgType},#{sendConfig},#{sendSwitch},#{platformRemark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_xhx_platform
+        (platformName,platformSn,sendMsgType,sendConfig,sendSwitch,platformRemark,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.platformName},#{item.platformSn},#{item.sendMsgType},#{item.sendConfig},#{item.sendSwitch},#{item.platformRemark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_xhx_platform as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('platformName')) or (colPickMode==1 and !data.containsKey('platformName'))">
+                a.platformName=#{data.platformName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('platformSn')) or (colPickMode==1 and !data.containsKey('platformSn'))">
+                a.platformSn=#{data.platformSn},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('sendMsgType')) or (colPickMode==1 and !data.containsKey('sendMsgType'))">
+                a.sendMsgType=#{data.sendMsgType},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('sendMsgTypeIncrement')) or (colPickMode==1 and !data.containsKey('sendMsgTypeIncrement'))">
+                a.sendMsgType=ifnull(a.sendMsgType,0) + #{data.sendMsgTypeIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('sendConfig')) or (colPickMode==1 and !data.containsKey('sendConfig'))">
+                a.sendConfig=#{data.sendConfig},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('sendSwitch')) or (colPickMode==1 and !data.containsKey('sendSwitch'))">
+                a.sendSwitch=#{data.sendSwitch},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('sendSwitchIncrement')) or (colPickMode==1 and !data.containsKey('sendSwitchIncrement'))">
+                a.sendSwitch=ifnull(a.sendSwitch,0) + #{data.sendSwitchIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('platformRemark')) or (colPickMode==1 and !data.containsKey('platformRemark'))">
+                a.platformRemark=#{data.platformRemark},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
+                a.createUserId=#{data.createUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+                a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.createTime=#{data.createTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
+                a.updateUserId=#{data.updateUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
+                a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+                a.updateTime=#{data.updateTime},
+            </if>
+        </trim>
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </update>
+    <!-- 批量更新 -->
+    <update id="updateBatch" parameterType="paramDto">
+        update mortals_xhx_platform as a
+        <trim prefix="set" suffixOverrides=",">
+                <trim prefix="platformName=(case" suffix="ELSE platformName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('platformName')) or (colPickMode==1 and !item.containsKey('platformName'))">
+                            when a.id=#{item.id} then #{item.platformName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="platformSn=(case" suffix="ELSE platformSn end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('platformSn')) or (colPickMode==1 and !item.containsKey('platformSn'))">
+                            when a.id=#{item.id} then #{item.platformSn}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="sendMsgType=(case" suffix="ELSE sendMsgType end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('sendMsgType')) or (colPickMode==1 and !item.containsKey('sendMsgType'))">
+                                        when a.id=#{item.id} then #{item.sendMsgType}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('sendMsgTypeIncrement')) or (colPickMode==1 and !item.containsKey('sendMsgTypeIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.sendMsgType,0) + #{item.sendMsgTypeIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="sendConfig=(case" suffix="ELSE sendConfig end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('sendConfig')) or (colPickMode==1 and !item.containsKey('sendConfig'))">
+                            when a.id=#{item.id} then #{item.sendConfig}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="sendSwitch=(case" suffix="ELSE sendSwitch end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('sendSwitch')) or (colPickMode==1 and !item.containsKey('sendSwitch'))">
+                                        when a.id=#{item.id} then #{item.sendSwitch}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('sendSwitchIncrement')) or (colPickMode==1 and !item.containsKey('sendSwitchIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.sendSwitch,0) + #{item.sendSwitchIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="platformRemark=(case" suffix="ELSE platformRemark end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('platformRemark')) or (colPickMode==1 and !item.containsKey('platformRemark'))">
+                            when a.id=#{item.id} then #{item.platformRemark}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                                        when a.id=#{item.id} then #{item.createUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                            when a.id=#{item.id} then #{item.createTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
+                                        when a.id=#{item.id} then #{item.updateUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                            when a.id=#{item.id} then #{item.updateTime}
+                        </if>
+                    </foreach>
+                </trim>
+        </trim>
+        where id in
+        <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="PlatformEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_platform as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_xhx_platform as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_xhx_platform where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_xhx_platform as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="PlatformEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_platform as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+        <include refid="_orderCols_"/>
+    </select>
+
+
+
+    <!-- 获取 -->
+    <select id="getListCount" parameterType="paramDto" resultType="int">
+        select count(1)
+        from mortals_xhx_platform as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+    <!-- 条件映射 -->
+    <sql id="_condition_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+            <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
+            <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
+                and
+                <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
+                    <trim prefixOverrides="or" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="andCondition"/>
+                            <property name="_conditionType_" value="or"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+            <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
+            <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
+                and
+                <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
+                    <trim prefixOverrides="and" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="orCondition"/>
+                            <property name="_conditionType_" value="and"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+        </if>
+    </sql>
+    <!-- 条件映射-代参数 -->
+    <sql id="_condition_param_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null">
+                ${_conditionType_} a.id=#{${_conditionParam_}.id}
+            </if>
+        </if>
+            <if test="conditionParamRef.containsKey('id')">
+                <if test="conditionParamRef.id != null ">
+                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
+                </if>
+                <if test="conditionParamRef.id == null">
+                    ${_conditionType_} a.id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('idList')">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+                ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+            </if>
+            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('platformName')">
+                <if test="conditionParamRef.platformName != null and conditionParamRef.platformName != ''">
+                    ${_conditionType_} a.platformName like #{${_conditionParam_}.platformName}
+                </if>
+                <if test="conditionParamRef.platformName == null">
+                    ${_conditionType_} a.platformName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('platformNameList')">
+                ${_conditionType_} a.platformName in
+                <foreach collection="conditionParamRef.platformNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('platformSn')">
+                <if test="conditionParamRef.platformSn != null and conditionParamRef.platformSn != ''">
+                    ${_conditionType_} a.platformSn like #{${_conditionParam_}.platformSn}
+                </if>
+                <if test="conditionParamRef.platformSn == null">
+                    ${_conditionType_} a.platformSn is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('platformSnList')">
+                ${_conditionType_} a.platformSn in
+                <foreach collection="conditionParamRef.platformSnList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('sendMsgType')">
+                <if test="conditionParamRef.sendMsgType != null ">
+                    ${_conditionType_} a.sendMsgType = #{${_conditionParam_}.sendMsgType}
+                </if>
+                <if test="conditionParamRef.sendMsgType == null">
+                    ${_conditionType_} a.sendMsgType is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('sendMsgTypeList')">
+                ${_conditionType_} a.sendMsgType in
+                <foreach collection="conditionParamRef.sendMsgTypeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('sendMsgTypeStart') and conditionParamRef.sendMsgTypeStart != null">
+                ${_conditionType_} a.sendMsgType <![CDATA[ >= ]]> #{${_conditionParam_}.sendMsgTypeStart}
+            </if>
+            <if test="conditionParamRef.containsKey('sendMsgTypeEnd') and conditionParamRef.sendMsgTypeEnd != null">
+                ${_conditionType_} a.sendMsgType <![CDATA[ <= ]]> #{${_conditionParam_}.sendMsgTypeEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('sendConfig')">
+                <if test="conditionParamRef.sendConfig != null and conditionParamRef.sendConfig != ''">
+                    ${_conditionType_} a.sendConfig like #{${_conditionParam_}.sendConfig}
+                </if>
+                <if test="conditionParamRef.sendConfig == null">
+                    ${_conditionType_} a.sendConfig is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('sendConfigList')">
+                ${_conditionType_} a.sendConfig in
+                <foreach collection="conditionParamRef.sendConfigList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('sendSwitch')">
+                <if test="conditionParamRef.sendSwitch != null ">
+                    ${_conditionType_} a.sendSwitch = #{${_conditionParam_}.sendSwitch}
+                </if>
+                <if test="conditionParamRef.sendSwitch == null">
+                    ${_conditionType_} a.sendSwitch is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('sendSwitchList')">
+                ${_conditionType_} a.sendSwitch in
+                <foreach collection="conditionParamRef.sendSwitchList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('sendSwitchStart') and conditionParamRef.sendSwitchStart != null">
+                ${_conditionType_} a.sendSwitch <![CDATA[ >= ]]> #{${_conditionParam_}.sendSwitchStart}
+            </if>
+            <if test="conditionParamRef.containsKey('sendSwitchEnd') and conditionParamRef.sendSwitchEnd != null">
+                ${_conditionType_} a.sendSwitch <![CDATA[ <= ]]> #{${_conditionParam_}.sendSwitchEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('platformRemark')">
+                <if test="conditionParamRef.platformRemark != null and conditionParamRef.platformRemark != ''">
+                    ${_conditionType_} a.platformRemark like #{${_conditionParam_}.platformRemark}
+                </if>
+                <if test="conditionParamRef.platformRemark == null">
+                    ${_conditionType_} a.platformRemark is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('platformRemarkList')">
+                ${_conditionType_} a.platformRemark in
+                <foreach collection="conditionParamRef.platformRemarkList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserId')">
+                <if test="conditionParamRef.createUserId != null ">
+                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+                </if>
+                <if test="conditionParamRef.createUserId == null">
+                    ${_conditionType_} a.createUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList')">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+                ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.createTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserId')">
+                <if test="conditionParamRef.updateUserId != null ">
+                    ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
+                </if>
+                <if test="conditionParamRef.updateUserId == null">
+                    ${_conditionType_} a.updateUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdList')">
+                ${_conditionType_} a.updateUserId in
+                <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.updateTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+    </sql>
+    <sql id="_orderCols_">
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                     ${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                    <if test="orderCol.containsKey('id')">
+                        a.id
+                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('platformName')">
+                        a.platformName
+                        <if test='orderCol.platformName != null and "DESC".equalsIgnoreCase(orderCol.platformName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('platformSn')">
+                        a.platformSn
+                        <if test='orderCol.platformSn != null and "DESC".equalsIgnoreCase(orderCol.platformSn)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('sendMsgType')">
+                        a.sendMsgType
+                        <if test='orderCol.sendMsgType != null and "DESC".equalsIgnoreCase(orderCol.sendMsgType)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('sendConfig')">
+                        a.sendConfig
+                        <if test='orderCol.sendConfig != null and "DESC".equalsIgnoreCase(orderCol.sendConfig)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('sendSwitch')">
+                        a.sendSwitch
+                        <if test='orderCol.sendSwitch != null and "DESC".equalsIgnoreCase(orderCol.sendSwitch)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('platformRemark')">
+                        a.platformRemark
+                        <if test='orderCol.platformRemark != null and "DESC".equalsIgnoreCase(orderCol.platformRemark)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createUserId')">
+                        a.createUserId
+                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.createTime
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateUserId')">
+                        a.updateUserId
+                        <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.updateTime
+                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                        ,
+                    </if>
+            </trim>
+        </if>
+    </sql>
+    <sql id="_group_by_">
+        <if test="groupList != null and !groupList.isEmpty()">
+            GROUP BY
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
+                    ${item}
+                </foreach>
+            </trim>
+        </if>
+    </sql>
+</mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.product.dao.ibatis.ProductDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="ProductEntity" id="ProductEntity-Map">
+            <id  property="id" column="id" />
+            <result property="productName" column="productName" />
+            <result property="productCode" column="productCode" />
+            <result property="exchangeName" column="exchangeName" />
+            <result property="productRemark" column="productRemark" />
+            <result property="createUserId" column="createUserId" />
+            <result property="createTime" column="createTime" />
+            <result property="updateUserId" column="updateUserId" />
+            <result property="updateTime" column="updateTime" />
+            
+    </resultMap>
+
+
+    <!-- 表所有列 -->
+    <sql id="_columns">
+        <trim suffixOverrides="," suffix="">
+                <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('productName') or colPickMode == 1 and data.containsKey('productName')))">
+                    a.productName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('productCode') or colPickMode == 1 and data.containsKey('productCode')))">
+                    a.productCode,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('exchangeName') or colPickMode == 1 and data.containsKey('exchangeName')))">
+                    a.exchangeName,
+                </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>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                    a.createUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.createTime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
+                    a.updateUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                    a.updateTime,
+                </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="ProductEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_product
+        (productName,productCode,exchangeName,productRemark,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        (#{productName},#{productCode},#{exchangeName},#{productRemark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_xhx_product
+        (productName,productCode,exchangeName,productRemark,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.productName},#{item.productCode},#{item.exchangeName},#{item.productRemark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_xhx_product as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('productName')) or (colPickMode==1 and !data.containsKey('productName'))">
+                a.productName=#{data.productName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('productCode')) or (colPickMode==1 and !data.containsKey('productCode'))">
+                a.productCode=#{data.productCode},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('exchangeName')) or (colPickMode==1 and !data.containsKey('exchangeName'))">
+                a.exchangeName=#{data.exchangeName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('productRemark')) or (colPickMode==1 and !data.containsKey('productRemark'))">
+                a.productRemark=#{data.productRemark},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
+                a.createUserId=#{data.createUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+                a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.createTime=#{data.createTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
+                a.updateUserId=#{data.updateUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
+                a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+                a.updateTime=#{data.updateTime},
+            </if>
+        </trim>
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </update>
+    <!-- 批量更新 -->
+    <update id="updateBatch" parameterType="paramDto">
+        update mortals_xhx_product as a
+        <trim prefix="set" suffixOverrides=",">
+                <trim prefix="productName=(case" suffix="ELSE productName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('productName')) or (colPickMode==1 and !item.containsKey('productName'))">
+                            when a.id=#{item.id} then #{item.productName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="productCode=(case" suffix="ELSE productCode end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('productCode')) or (colPickMode==1 and !item.containsKey('productCode'))">
+                            when a.id=#{item.id} then #{item.productCode}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="exchangeName=(case" suffix="ELSE exchangeName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('exchangeName')) or (colPickMode==1 and !item.containsKey('exchangeName'))">
+                            when a.id=#{item.id} then #{item.exchangeName}
+                        </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'))">
+                            when a.id=#{item.id} then #{item.productRemark}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                                        when a.id=#{item.id} then #{item.createUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                            when a.id=#{item.id} then #{item.createTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
+                                        when a.id=#{item.id} then #{item.updateUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                            when a.id=#{item.id} then #{item.updateTime}
+                        </if>
+                    </foreach>
+                </trim>
+        </trim>
+        where id in
+        <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="ProductEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_product as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_xhx_product as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_xhx_product where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_xhx_product as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="ProductEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_product as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+        <include refid="_orderCols_"/>
+    </select>
+
+
+
+    <!-- 获取 -->
+    <select id="getListCount" parameterType="paramDto" resultType="int">
+        select count(1)
+        from mortals_xhx_product as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+    <!-- 条件映射 -->
+    <sql id="_condition_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+            <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
+            <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
+                and
+                <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
+                    <trim prefixOverrides="or" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="andCondition"/>
+                            <property name="_conditionType_" value="or"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+            <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
+            <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
+                and
+                <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
+                    <trim prefixOverrides="and" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="orCondition"/>
+                            <property name="_conditionType_" value="and"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+        </if>
+    </sql>
+    <!-- 条件映射-代参数 -->
+    <sql id="_condition_param_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null">
+                ${_conditionType_} a.id=#{${_conditionParam_}.id}
+            </if>
+        </if>
+            <if test="conditionParamRef.containsKey('id')">
+                <if test="conditionParamRef.id != null ">
+                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
+                </if>
+                <if test="conditionParamRef.id == null">
+                    ${_conditionType_} a.id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('idList')">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+                ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+            </if>
+            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('productName')">
+                <if test="conditionParamRef.productName != null and conditionParamRef.productName != ''">
+                    ${_conditionType_} a.productName like #{${_conditionParam_}.productName}
+                </if>
+                <if test="conditionParamRef.productName == null">
+                    ${_conditionType_} a.productName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('productNameList')">
+                ${_conditionType_} a.productName in
+                <foreach collection="conditionParamRef.productNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('productCode')">
+                <if test="conditionParamRef.productCode != null and conditionParamRef.productCode != ''">
+                    ${_conditionType_} a.productCode like #{${_conditionParam_}.productCode}
+                </if>
+                <if test="conditionParamRef.productCode == null">
+                    ${_conditionType_} a.productCode is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('productCodeList')">
+                ${_conditionType_} a.productCode in
+                <foreach collection="conditionParamRef.productCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('exchangeName')">
+                <if test="conditionParamRef.exchangeName != null and conditionParamRef.exchangeName != ''">
+                    ${_conditionType_} a.exchangeName like #{${_conditionParam_}.exchangeName}
+                </if>
+                <if test="conditionParamRef.exchangeName == null">
+                    ${_conditionType_} a.exchangeName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('exchangeNameList')">
+                ${_conditionType_} a.exchangeName in
+                <foreach collection="conditionParamRef.exchangeNameList" 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}
+                </if>
+                <if test="conditionParamRef.productRemark == null">
+                    ${_conditionType_} a.productRemark is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('productRemarkList')">
+                ${_conditionType_} a.productRemark in
+                <foreach collection="conditionParamRef.productRemarkList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserId')">
+                <if test="conditionParamRef.createUserId != null ">
+                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+                </if>
+                <if test="conditionParamRef.createUserId == null">
+                    ${_conditionType_} a.createUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList')">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+                ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.createTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserId')">
+                <if test="conditionParamRef.updateUserId != null ">
+                    ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
+                </if>
+                <if test="conditionParamRef.updateUserId == null">
+                    ${_conditionType_} a.updateUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdList')">
+                ${_conditionType_} a.updateUserId in
+                <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.updateTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+    </sql>
+    <sql id="_orderCols_">
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                     ${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                    <if test="orderCol.containsKey('id')">
+                        a.id
+                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('productName')">
+                        a.productName
+                        <if test='orderCol.productName != null and "DESC".equalsIgnoreCase(orderCol.productName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('productCode')">
+                        a.productCode
+                        <if test='orderCol.productCode != null and "DESC".equalsIgnoreCase(orderCol.productCode)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('exchangeName')">
+                        a.exchangeName
+                        <if test='orderCol.exchangeName != null and "DESC".equalsIgnoreCase(orderCol.exchangeName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('productRemark')">
+                        a.productRemark
+                        <if test='orderCol.productRemark != null and "DESC".equalsIgnoreCase(orderCol.productRemark)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createUserId')">
+                        a.createUserId
+                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.createTime
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateUserId')">
+                        a.updateUserId
+                        <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.updateTime
+                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                        ,
+                    </if>
+            </trim>
+        </if>
+    </sql>
+    <sql id="_group_by_">
+        <if test="groupList != null and !groupList.isEmpty()">
+            GROUP BY
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
+                    ${item}
+                </foreach>
+            </trim>
+        </if>
+    </sql>
+</mapper>
\ No newline at end of file

device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http

@@ -54,7 +54,7 @@ POST {{baseUrl}}/api/active
 Content-Type: application/json
 
 {
-  "deviceNum":"a12345678",
+  "deviceNum":"b12345678",
   "deviceMac":"AB:DD:DF:FD:AD:FA:DA:SS",
   "action":"active"
 }