添加基础设备同步

base-manager/db/add.sql

@@ -102,3 +102,37 @@ INSERT INTO `mortals_xhx_resource` VALUES (null, '大厅窗口-菜单管理-维
 -- ----------------------------
 ALTER TABLE mortals_sys_window ADD COLUMN `nameDesc` varchar (256)  default "" COMMENT '名称描述' AFTER englishName;
 ALTER TABLE mortals_sys_window ADD COLUMN `englishNameDesc` varchar (256)  default "" COMMENT '英文名称描述' AFTER nameDesc;
+
+
+-- ----------------------------
+2023-5-06
+-- ----------------------------
+-- ----------------------------
+-- 设备表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_device`;
+CREATE TABLE `mortals_xhx_device` (
+      `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键ID，主键，自增长',
+      `deviceId` bigint(20) DEFAULT NULL COMMENT '设备id',
+      `deviceName` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '设备名称',
+      `deviceCode` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '设备编码',
+      `deviceMac` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '设备的MAC地址',
+      `siteId` bigint(20) DEFAULT NULL COMMENT '站点Id',
+      `siteCode` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '站点编号，来源基础服务平台',
+      `siteName` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '站点名称',
+      `productCode` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '产品编码',
+      `productName` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '产品名称',
+      `deviceSrc` tinyint(2) DEFAULT 2 COMMENT '设备来源(0.子设备，1.网关设备，2.直连设备)',
+      `lon` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '经度',
+      `lati` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '纬度',
+      `leadingOfficial` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '负责人',
+      `leadingOfficialTelephone` varchar(11) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '联系电话',
+      `deviceStatus` tinyint(2) DEFAULT NULL COMMENT '设备状态 (0.未激活，1.离线,2.在线)',
+      `deviceRemark` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '备注',
+      `source` tinyint(2) DEFAULT 1 COMMENT '设备来源(0.旧设备，1.新设备)',
+      `createUserId` bigint(20) NOT NULL COMMENT '创建用户',
+      `createTime` datetime NOT NULL COMMENT '创建时间',
+      `updateUserId` bigint(20) DEFAULT NULL COMMENT '更新用户',
+      `updateTime` datetime DEFAULT NULL COMMENT '更新时间',
+      PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COMMENT='设备';

base-manager/src/main/java/com/mortals/xhx/busiz/SignDemo.java

+package com.mortals.xhx.busiz;
+
+import com.alibaba.fastjson.JSONObject;
+import com.mortals.xhx.common.utils.EncryptionUtils;
+import org.springframework.http.HttpMethod;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
+
+public class SignDemo {
+
+    private static String getSortedParams(String methodName, Map<String, String> headerMap, Map<String, String> paramsMap, String body) {
+        TreeMap<String, Object> paramMap = new TreeMap<>();
+
+        // 获取query参数
+        if (!paramsMap.isEmpty()) {
+            for (Map.Entry<String, String> entry : paramsMap.entrySet()) {
+                paramMap.put(entry.getKey(), entry.getValue());
+            }
+        }
+        // 获取body内容
+        if (HttpMethod.POST.name().equals(methodName)) {
+            paramMap.put("body", body);
+        }
+
+        paramMap.put("appId", headerMap.get("appId"));
+        paramMap.put("appKey", headerMap.get("appKey"));
+        paramMap.put("timeStamp", headerMap.get("timeStamp"));
+        paramMap.put("nonce", headerMap.get("nonce"));
+        paramMap.put("secretKey", headerMap.get("appSecret"));
+
+        StringBuilder signSb = new StringBuilder();
+
+        signSb.append("appId").append("=").append(paramMap.get("appId")).append("&");
+        signSb.append("appKey").append("=").append(paramMap.get("appKey")).append("&");
+        signSb.append("body").append("=").append(paramMap.get("body")).append("&");
+        signSb.append("timeStamp").append("=").append(paramMap.get("timeStamp")).append("&");
+        signSb.append("nonce").append("=").append(paramMap.get("nonce")).append("&");
+        signSb.append("secretKey").append("=").append(paramMap.get("secretKey")).append("&");
+
+
+/*        for (Map.Entry<String, Object> params : paramMap.entrySet()) {
+            signSb.append(params.getKey()).append("=").append(params.getValue() + "").append("&");
+        }*/
+        String signStr = signSb.substring(0, signSb.length() - 1);
+        System.out.println("SignDemo.签名源字符串: " + signStr);
+        String sign = EncryptionUtils.SHA256(signStr);
+        System.out.println("SignDemo.签名计算结果: " + sign);
+
+        return sign;
+    }
+
+    public static void main(String[] args) {
+        String methodName = "POST";
+        Map<String, String> headerMap = new HashMap<>();
+        headerMap.put("appId", "01C67D56D0630517");
+        headerMap.put("appKey", "a0b946c858aa8d06");
+        headerMap.put("timeStamp", "1677838709935");
+        headerMap.put("nonce", "894576350573");
+        headerMap.put("appSecret", "ad80c59e575a78ab");
+
+        Map<String, String> paramsMap = new HashMap<>();
+        paramsMap.put("param", "哈哈哈");
+
+        JSONObject object = new JSONObject();
+        object.put("test", "哈哈哈");
+        String body = object.toJSONString();
+
+        getSortedParams(methodName, headerMap, paramsMap, body);
+    }
+
+}

base-manager/src/main/java/com/mortals/xhx/daemon/DeptXMLXPathParser.java

+package com.mortals.xhx.daemon;
+
+import cn.hutool.http.HttpUtil;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.htmlcleaner.CleanerProperties;
+import org.htmlcleaner.DomSerializer;
+import org.htmlcleaner.HtmlCleaner;
+import org.htmlcleaner.TagNode;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+
+
+public class DeptXMLXPathParser {
+
+    public static void main(String[] args) throws Exception {
+        String url = "http://www.sczwfw.gov.cn/jiq/front/channel/deptSwitch?areaCode=510116000000";
+        String exp = "//ul[@class='bm-list']//li";
+
+        String html = null;
+        try {
+            html= HttpUtil.get(url);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        HtmlCleaner hc = new HtmlCleaner();
+        TagNode tn = hc.clean(html);
+        Document dom = new DomSerializer(new CleanerProperties()).createDOM(tn);
+        XPath xPath = XPathFactory.newInstance().newXPath();
+        Object result;
+        result = xPath.evaluate(exp, dom, XPathConstants.NODESET);
+        if (result instanceof NodeList) {
+            NodeList nodeList = (NodeList) result;
+          //  System.out.println(nodeList.getLength());
+            for (int i = 0; i < nodeList.getLength(); i++) {
+                Node node = nodeList.item(i);
+                /**
+                 * Node.getTextContent() 此属性返回此节点及其后代的文本内容。
+                 * Node.getFirstChild()  此节点的第一个子节点。
+                 * Node.getAttributes() 包含此节点的属性的 NamedNodeMap（如果它是 Element）；否则为 null
+                 * 如果想获取相应对象的相关属性，可以调用  getAttributes().getNamedItem("属性名") 方法
+                 */
+
+                System.out.println(node.getAttributes().getNamedItem("title").getNodeValue());
+
+                System.out.println(
+                        node.getNodeValue() == null ? StringEscapeUtils.unescapeHtml4(node.getFirstChild().getAttributes().getNamedItem("href").getNodeValue()) : node.getNodeValue());
+            }
+
+        }
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/daemon/MatterDetailXMLXPathParser.java

+package com.mortals.xhx.daemon;
+
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import org.htmlcleaner.CleanerProperties;
+import org.htmlcleaner.DomSerializer;
+import org.htmlcleaner.HtmlCleaner;
+import org.htmlcleaner.TagNode;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *事项抓取测试
+ * @author:
+ * @date: 2022/11/13 17:45
+ */
+public class MatterDetailXMLXPathParser {
+
+    public static void main(String[] args) throws Exception {
+        String url = "http://www.sczwfw.gov.cn/jiq/front/transition/ywTransToDetail?areaCode=510116000000&itemCode=511A0081000005-510116000000-000-11510122009212050T-1-00&taskType=1&deptCode=11510122009212050T";
+        String matterListExp = "//div[@class='sx_list']//div[class=\"sub_list1_main\"]";
+        String matterTotalExp = "//input[@id=\"result_count\"]";
+        String matterPageNumExp = "//input[@id=\"pageNum\"]";
+
+        //String baseInfoExp = "//div[@class=\"bigbox1\"]/div//table[1]//td";
+        String baseInfoExp = "//div[@class=\"section1\"]//table[1]//td";
+        String baseInfoExp1 = "//div[@class=\"section2\"]/table[1]//td";
+        String baseInfoExp2 = "//div[@class=\"section3\"]/table[1]//td";
+        String baseInfoExp3 = "//div[@class=\"section4\"]/table//td";
+        baseInfoExp+="|"+baseInfoExp1;
+        baseInfoExp+="|"+baseInfoExp2;
+        baseInfoExp+="|"+baseInfoExp3;
+        System.out.println(baseInfoExp);
+        Map<String, String> params = new HashMap<>();
+        JSONObject json = new JSONObject();
+
+        String html = null;
+        try {
+            html= HttpUtil.get(url);
+            //System.out.println(html);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        HtmlCleaner hc = new HtmlCleaner();
+        TagNode tn = hc.clean(html);
+        Document dom = new DomSerializer(new CleanerProperties()).createDOM(tn);
+        XPath xPath = XPathFactory.newInstance().newXPath();
+        Object result;
+        result = xPath.evaluate(baseInfoExp, dom, XPathConstants.NODESET);
+        if (result instanceof NodeList) {
+            NodeList nodeList = (NodeList) result;
+            for (int i = 0; i < nodeList.getLength(); i++) {
+                if(i%2==0){
+                    continue;
+                }
+                Node node = nodeList.item(i);
+               if(i>0){
+                   Node prenode = nodeList.item(i - 1);
+                   params.put(prenode.getTextContent().trim(),node.getTextContent().trim());
+                   json.put(prenode.getTextContent().trim(),node.getTextContent().trim());
+               }
+
+            }
+
+        }
+
+        System.out.println(JSON.toJSONString(json));
+
+
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/daemon/MatterXMLXPathParser.java

+package com.mortals.xhx.daemon;
+
+import cn.hutool.http.HttpUtil;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.htmlcleaner.CleanerProperties;
+import org.htmlcleaner.DomSerializer;
+import org.htmlcleaner.HtmlCleaner;
+import org.htmlcleaner.TagNode;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+
+/**
+ *事项抓取测试
+ * @author:
+ * @date: 2022/11/13 17:45
+ */
+public class MatterXMLXPathParser {
+
+    public static void main(String[] args) throws Exception {
+        String url = "http://www.sczwfw.gov.cn/jiq/front/item/qlqd?areaCode=510116000000";
+        String matterListExp = "//div[@class='sx_list']//div[class=\"sub_list1_main\"]";
+        String matterTotalExp = "//input[@id=\"result_count\"] | //input[@id=\"pageNum\"]";
+        String matterPageNumExp = "//input[@id=\"pageNum\"]";
+
+        String html = null;
+        try {
+            html= HttpUtil.get(url);
+            System.out.println(html);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        HtmlCleaner hc = new HtmlCleaner();
+        TagNode tn = hc.clean(html);
+        Document dom = new DomSerializer(new CleanerProperties()).createDOM(tn);
+        XPath xPath = XPathFactory.newInstance().newXPath();
+        Object result;
+        result = xPath.evaluate(matterTotalExp, dom, XPathConstants.NODESET);
+        if (result instanceof NodeList) {
+            NodeList nodeList = (NodeList) result;
+            for (int i = 0; i < nodeList.getLength(); i++) {
+                Node node = nodeList.item(i);
+                System.out.println(node.getAttributes().getNamedItem("value").getNodeValue());
+            }
+
+        }
+
+      /*  result = xPath.evaluate(matterPageNumExp, dom, XPathConstants.NODESET);
+        if (result instanceof NodeList) {
+            NodeList nodeList = (NodeList) result;
+            for (int i = 0; i < nodeList.getLength(); i++) {
+                Node node = nodeList.item(i);
+                System.out.println(node.getAttributes().getNamedItem("value").getNodeValue());
+            }
+
+        }*/
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/daemon/Test.java

+package com.mortals.xhx.daemon;
+
+import cn.hutool.core.util.XmlUtil;
+import cn.hutool.http.HttpUtil;
+import org.springframework.util.xml.SimpleNamespaceContext;
+import org.w3c.dom.*;
+
+import javax.xml.namespace.NamespaceContext;
+import javax.xml.xpath.XPathConstants;
+import java.util.stream.Collectors;
+
+public class Test {
+
+    public static NamespaceContext buildNsByDocument(Document document) {
+        SimpleNamespaceContext ns = new SimpleNamespaceContext();
+        Element rootElement = XmlUtil.getRootElement(document);
+        NamedNodeMap namedNodeMap = rootElement.getAttributes();
+        // 遍历复制给firstMap存起来
+        for (int i = 0; i < namedNodeMap.getLength(); i++) {
+            Attr attr = (Attr) namedNodeMap.item(i);
+            if (attr.getName().startsWith("xmlns:")) {
+                ns.bindNamespaceUri(attr.getName().split(":")[1], attr.getValue());
+            }
+        }
+        return ns;
+    }
+
+    public static void main(String[] args) {
+        String rest = HttpUtil.get("http://www.sczwfw.gov.cn/jiq/front/channel/deptSwitch?areaCode=510116000000");
+
+        Document document = XmlUtil.readXML(rest);
+//        String xpath = "//ul[@class='bm-list']/ul";
+//        NodeList nodeList = XmlUtil.getNodeListByXPath(xpath, document);
+//for(int i=0;i<nodeList.getLength();i++){
+//    Node item = nodeList.item(i);
+//    System.out.println(item.getTextContent() );
+//}
+
+        System.out.println(rest);
+
+
+    }
+}

base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java

+package com.mortals.xhx.daemon.task;
+
+import com.alibaba.fastjson.JSON;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.service.ITask;
+import com.mortals.framework.service.ITaskExcuteService;
+import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.device.DevicePdu;
+import com.mortals.xhx.common.utils.BeanUtil;
+import com.mortals.xhx.feign.device.IDeviceFeign;
+import com.mortals.xhx.module.device.model.DeviceEntity;
+import com.mortals.xhx.module.device.model.DeviceQuery;
+import com.mortals.xhx.module.device.service.DeviceService;
+import com.mortals.xhx.module.site.model.SiteEntity;
+import com.mortals.xhx.module.site.model.SiteQuery;
+import com.mortals.xhx.module.site.service.SiteService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 同步事项列表
+ */
+@Slf4j
+@Service("SyncSiteDeviceTask")
+public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
+
+    @Autowired
+    private IDeviceFeign deviceFeign;
+    @Autowired
+    private DeviceService deviceService;
+    @Autowired
+    private SiteService siteService;
+
+
+    @Override
+    public void excuteTask(ITask task) throws AppException {
+        log.info("开始同步设备列表！");
+        syncDevice();
+        log.info("结束同步设备列表！");
+    }
+
+    private void syncDevice() {
+
+
+        List<SiteEntity> siteEntities = siteService.find(new SiteQuery());
+        for (SiteEntity site : siteEntities) {
+            //List<SiteEntity> siteList = siteService.getFlatSitesBySiteId(siteEntity.getId(), null);
+            log.info("站点名称:{}", site.getSiteName());
+            DevicePdu devicePdu = new DevicePdu();
+            devicePdu.setSiteId(site.getId());
+            devicePdu.setSize(-1);
+            Rest<RespData<List<DevicePdu>>> deviceRest = deviceFeign.list(devicePdu);
+            log.info("deviceRest：{}", JSON.toJSONString(deviceRest));
+            if (YesNoEnum.YES.getValue() == deviceRest.getCode()) {
+                List<DevicePdu> devicePduList = deviceRest.getData().getData();
+                log.info("样表机总数量：{}", devicePduList.size());
+                if (!ObjectUtils.isEmpty(devicePduList)) {
+                    List<DeviceEntity> newDeviceList = devicePduList.stream().map(newDevice -> {
+                        DeviceEntity deviceEntity = new DeviceEntity();
+                        deviceEntity.initAttrValue();
+                        BeanUtils.copyProperties(newDevice, deviceEntity, BeanUtil.getNullPropertyNames(newDevice));
+                        return deviceEntity;
+                    }).collect(Collectors.toList());
+
+                    List<DeviceEntity> oldDeviceList = deviceService.find(new DeviceQuery().siteId(site.getId()));
+                    Map<String, DeviceEntity> oldDeviceMap = oldDeviceList.stream().collect(Collectors.toMap(x -> x.getDeviceCode(), y -> y, (o, n) -> n));
+                    Map<String, DeviceEntity> newDeviceMap = newDeviceList.stream().collect(Collectors.toMap(x -> x.getDeviceCode(), y -> y, (o, n) -> n));
+
+                    List<DeviceEntity> updateDeviceLsit = newDeviceList.stream().map(item -> {
+                        if (oldDeviceMap.containsKey(item.getDeviceCode())) {
+                            item.setId(oldDeviceMap.get(item.getDeviceCode()).getId());
+                            item.setDeviceId(item.getId());
+                            item.setProductCode(oldDeviceMap.get(item.getDeviceCode()).getProductCode());
+                            item.setProductName(oldDeviceMap.get(item.getDeviceCode()).getProductName());
+                            item.setUpdateTime(new Date());
+                            return item;
+                        }
+                        return null;
+                    }).filter(f -> f != null).collect(Collectors.toList());
+
+                    List<DeviceEntity> saveDeviceList = newDeviceList.stream().map(item -> {
+                        if (!oldDeviceMap.containsKey(item.getDeviceCode())) {
+                            item.setDeviceId(item.getId());
+                            item.setCreateUserId(1L);
+                            item.setCreateUserName("系统管理员");
+                            item.setCreateTime(new Date());
+                            return item;
+                        }
+                        return null;
+                    }).filter(f -> f != null).collect(Collectors.toList());
+
+                    //做差集
+                    List<Long> delDeviceList = oldDeviceList.stream().map(item -> {
+                        if (!newDeviceMap.containsKey(item.getDeviceCode())) {
+                            return item.getId();
+                        }
+                        return null;
+                    }).filter(f -> f != null).collect(Collectors.toList());
+
+                    if (!ObjectUtils.isEmpty(updateDeviceLsit)) {
+                        log.info("设备更新，size:{}", updateDeviceLsit.size());
+                        deviceService.update(updateDeviceLsit);
+                    }
+
+                    if (!ObjectUtils.isEmpty(saveDeviceList)) {
+                        log.info("设备新增，size:{}", saveDeviceList.size());
+                        deviceService.save(saveDeviceList);
+                    }
+
+                    if (!ObjectUtils.isEmpty(delDeviceList)) {
+                        log.info("设备删除，size:{}", delDeviceList.size());
+                        deviceService.remove(delDeviceList, null);
+                    }
+                }
+            } else {
+                log.info("设备列表查询异常，{}", JSON.toJSONString(deviceRest));
+            }
+
+
+        }
+
+    }
+
+
+    @Override
+    public void stopTask(ITask task) throws AppException {
+
+    }
+}

base-manager/src/main/java/com/mortals/xhx/module/device/dao/DeviceDao.java

+package com.mortals.xhx.module.device.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.device.model.DeviceEntity;
+
+/**
+* 设备Dao
+* 设备 DAO接口
+*
+* @author zxfei
+* @date 2023-02-25
+*/
+
+public interface  DeviceDao extends ICRUDDao<DeviceEntity,Long>{
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/device/dao/ibatis/DeviceDaoImpl.java

+package com.mortals.xhx.module.device.dao.ibatis;
+
+
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import com.mortals.xhx.module.device.dao.DeviceDao;
+import com.mortals.xhx.module.device.model.DeviceEntity;
+import org.springframework.stereotype.Repository;
+
+/**
+* 设备DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-02-25
+*/
+@Repository("deviceDao")
+public class DeviceDaoImpl extends BaseCRUDDaoMybatis<DeviceEntity,Long> implements DeviceDao {
+
+
+
+}

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

+package com.mortals.xhx.module.device.model;
+
+import com.mortals.xhx.module.device.model.vo.DeviceVo;
+/**
+* 设备实体对象
+*
+* @author zxfei
+* @date 2023-02-25
+*/
+
+public class DeviceEntity extends DeviceVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 设备id
+    */
+    private Long deviceId;
+    /**
+    * 设备名称
+    */
+    private String deviceName;
+    /**
+    * 设备编码
+    */
+    private String deviceCode;
+    /**
+    * 设备的MAC地址
+    */
+    private String deviceMac;
+    /**
+    * 站点Id
+    */
+    private Long siteId;
+    /**
+    * 站点编号，来源基础服务平台
+    */
+    private String siteCode;
+    /**
+    * 站点名称
+    */
+    private String siteName;
+    /**
+    * 产品编码
+    */
+    private String productCode;
+    /**
+    * 产品名称
+    */
+    private String productName;
+    /**
+    * 设备来源(0.子设备，1.网关设备，2.直连设备)
+    */
+    private Integer deviceSrc;
+    /**
+    * 经度
+    */
+    private String lon;
+    /**
+    * 纬度
+    */
+    private String lati;
+    /**
+    * 负责人
+    */
+    private String leadingOfficial;
+    /**
+    * 联系电话
+    */
+    private String leadingOfficialTelephone;
+    /**
+    * 设备状态 (0.未激活，1.离线,2.在线)
+    */
+    private Integer deviceStatus;
+    /**
+    * 备注
+    */
+    private String deviceRemark;
+    /**
+    * 设备来源(0.旧设备，1.新设备)
+    */
+    private Integer source;
+
+
+
+    public DeviceEntity(){}
+    /**
+    * 获取 设备id
+    * @return Long
+    */
+    public Long getDeviceId(){
+        return deviceId;
+    }
+    /**
+    * 设置 设备id
+    * @param deviceId
+    */
+    public void setDeviceId(Long deviceId){
+        this.deviceId = deviceId;
+    }
+    /**
+    * 获取 设备名称
+    * @return String
+    */
+    public String getDeviceName(){
+        return deviceName;
+    }
+    /**
+    * 设置 设备名称
+    * @param deviceName
+    */
+    public void setDeviceName(String deviceName){
+        this.deviceName = deviceName;
+    }
+    /**
+    * 获取 设备编码
+    * @return String
+    */
+    public String getDeviceCode(){
+        return deviceCode;
+    }
+    /**
+    * 设置 设备编码
+    * @param deviceCode
+    */
+    public void setDeviceCode(String deviceCode){
+        this.deviceCode = deviceCode;
+    }
+    /**
+    * 获取 设备的MAC地址
+    * @return String
+    */
+    public String getDeviceMac(){
+        return deviceMac;
+    }
+    /**
+    * 设置 设备的MAC地址
+    * @param deviceMac
+    */
+    public void setDeviceMac(String deviceMac){
+        this.deviceMac = deviceMac;
+    }
+    /**
+    * 获取 站点Id
+    * @return Long
+    */
+    public Long getSiteId(){
+        return siteId;
+    }
+    /**
+    * 设置 站点Id
+    * @param siteId
+    */
+    public void setSiteId(Long siteId){
+        this.siteId = siteId;
+    }
+    /**
+    * 获取 站点编号，来源基础服务平台
+    * @return String
+    */
+    public String getSiteCode(){
+        return siteCode;
+    }
+    /**
+    * 设置 站点编号，来源基础服务平台
+    * @param siteCode
+    */
+    public void setSiteCode(String siteCode){
+        this.siteCode = siteCode;
+    }
+    /**
+    * 获取 站点名称
+    * @return String
+    */
+    public String getSiteName(){
+        return siteName;
+    }
+    /**
+    * 设置 站点名称
+    * @param siteName
+    */
+    public void setSiteName(String siteName){
+        this.siteName = siteName;
+    }
+    /**
+    * 获取 产品编码
+    * @return String
+    */
+    public String getProductCode(){
+        return productCode;
+    }
+    /**
+    * 设置 产品编码
+    * @param productCode
+    */
+    public void setProductCode(String productCode){
+        this.productCode = productCode;
+    }
+    /**
+    * 获取 产品名称
+    * @return String
+    */
+    public String getProductName(){
+        return productName;
+    }
+    /**
+    * 设置 产品名称
+    * @param productName
+    */
+    public void setProductName(String productName){
+        this.productName = productName;
+    }
+    /**
+    * 获取 设备来源(0.子设备，1.网关设备，2.直连设备)
+    * @return Integer
+    */
+    public Integer getDeviceSrc(){
+        return deviceSrc;
+    }
+    /**
+    * 设置 设备来源(0.子设备，1.网关设备，2.直连设备)
+    * @param deviceSrc
+    */
+    public void setDeviceSrc(Integer deviceSrc){
+        this.deviceSrc = deviceSrc;
+    }
+    /**
+    * 获取 经度
+    * @return String
+    */
+    public String getLon(){
+        return lon;
+    }
+    /**
+    * 设置 经度
+    * @param lon
+    */
+    public void setLon(String lon){
+        this.lon = lon;
+    }
+    /**
+    * 获取 纬度
+    * @return String
+    */
+    public String getLati(){
+        return lati;
+    }
+    /**
+    * 设置 纬度
+    * @param lati
+    */
+    public void setLati(String lati){
+        this.lati = lati;
+    }
+    /**
+    * 获取 负责人
+    * @return String
+    */
+    public String getLeadingOfficial(){
+        return leadingOfficial;
+    }
+    /**
+    * 设置 负责人
+    * @param leadingOfficial
+    */
+    public void setLeadingOfficial(String leadingOfficial){
+        this.leadingOfficial = leadingOfficial;
+    }
+    /**
+    * 获取 联系电话
+    * @return String
+    */
+    public String getLeadingOfficialTelephone(){
+        return leadingOfficialTelephone;
+    }
+    /**
+    * 设置 联系电话
+    * @param leadingOfficialTelephone
+    */
+    public void setLeadingOfficialTelephone(String leadingOfficialTelephone){
+        this.leadingOfficialTelephone = leadingOfficialTelephone;
+    }
+    /**
+    * 获取 设备状态 (0.未激活，1.离线,2.在线)
+    * @return Integer
+    */
+    public Integer getDeviceStatus(){
+        return deviceStatus;
+    }
+    /**
+    * 设置 设备状态 (0.未激活，1.离线,2.在线)
+    * @param deviceStatus
+    */
+    public void setDeviceStatus(Integer deviceStatus){
+        this.deviceStatus = deviceStatus;
+    }
+    /**
+    * 获取 备注
+    * @return String
+    */
+    public String getDeviceRemark(){
+        return deviceRemark;
+    }
+    /**
+    * 设置 备注
+    * @param deviceRemark
+    */
+    public void setDeviceRemark(String deviceRemark){
+        this.deviceRemark = deviceRemark;
+    }
+    /**
+    * 获取 设备来源(0.旧设备，1.新设备)
+    * @return Integer
+    */
+    public Integer getSource(){
+        return source;
+    }
+    /**
+    * 设置 设备来源(0.旧设备，1.新设备)
+    * @param source
+    */
+    public void setSource(Integer source){
+        this.source = source;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof DeviceEntity) {
+            DeviceEntity tmp = (DeviceEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",deviceId:").append(getDeviceId());
+        sb.append(",deviceName:").append(getDeviceName());
+        sb.append(",deviceCode:").append(getDeviceCode());
+        sb.append(",deviceMac:").append(getDeviceMac());
+        sb.append(",siteId:").append(getSiteId());
+        sb.append(",siteCode:").append(getSiteCode());
+        sb.append(",siteName:").append(getSiteName());
+        sb.append(",productCode:").append(getProductCode());
+        sb.append(",productName:").append(getProductName());
+        sb.append(",deviceSrc:").append(getDeviceSrc());
+        sb.append(",lon:").append(getLon());
+        sb.append(",lati:").append(getLati());
+        sb.append(",leadingOfficial:").append(getLeadingOfficial());
+        sb.append(",leadingOfficialTelephone:").append(getLeadingOfficialTelephone());
+        sb.append(",deviceStatus:").append(getDeviceStatus());
+        sb.append(",deviceRemark:").append(getDeviceRemark());
+        sb.append(",source:").append(getSource());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.deviceId = null;
+
+            this.deviceName = null;
+
+            this.deviceCode = null;
+
+            this.deviceMac = null;
+
+            this.siteId = null;
+
+            this.siteCode = null;
+
+            this.siteName = null;
+
+            this.productCode = null;
+
+            this.productName = null;
+
+            this.deviceSrc = 2;
+
+            this.lon = null;
+
+            this.lati = null;
+
+            this.leadingOfficial = null;
+
+            this.leadingOfficialTelephone = null;
+
+            this.deviceStatus = null;
+
+            this.deviceRemark = null;
+
+            this.source = 1;
+    }
+}
\ No newline at end of file

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

+package com.mortals.xhx.module.device.model;
+
+import java.util.List;
+
+/**
+* 设备查询对象
+*
+* @author zxfei
+* @date 2023-02-25
+*/
+public class DeviceQuery extends DeviceEntity {
+    /** 开始 主键ID，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 主键ID，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 主键ID，主键，自增长 */
+    private Long idIncrement;
+
+    /** 主键ID，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 主键ID，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
+    /** 开始 设备id */
+    private Long deviceIdStart;
+
+    /** 结束 设备id */
+    private Long deviceIdEnd;
+
+    /** 增加 设备id */
+    private Long deviceIdIncrement;
+
+    /** 设备id列表 */
+    private List <Long> deviceIdList;
+
+    /** 设备id排除列表 */
+    private List <Long> deviceIdNotList;
+
+    /** 设备名称 */
+    private List<String> deviceNameList;
+
+    /** 设备名称排除列表 */
+    private List <String> deviceNameNotList;
+    /** 设备编码 */
+    private List<String> deviceCodeList;
+
+    /** 设备编码排除列表 */
+    private List <String> deviceCodeNotList;
+    /** 设备的MAC地址 */
+    private List<String> deviceMacList;
+
+    /** 设备的MAC地址排除列表 */
+    private List <String> deviceMacNotList;
+    /** 开始 站点Id */
+    private Long siteIdStart;
+
+    /** 结束 站点Id */
+    private Long siteIdEnd;
+
+    /** 增加 站点Id */
+    private Long siteIdIncrement;
+
+    /** 站点Id列表 */
+    private List <Long> siteIdList;
+
+    /** 站点Id排除列表 */
+    private List <Long> siteIdNotList;
+
+    /** 站点编号，来源基础服务平台 */
+    private List<String> siteCodeList;
+
+    /** 站点编号，来源基础服务平台排除列表 */
+    private List <String> siteCodeNotList;
+    /** 站点名称 */
+    private List<String> siteNameList;
+
+    /** 站点名称排除列表 */
+    private List <String> siteNameNotList;
+    /** 产品编码 */
+    private List<String> productCodeList;
+
+    /** 产品编码排除列表 */
+    private List <String> productCodeNotList;
+    /** 产品名称 */
+    private List<String> productNameList;
+
+    /** 产品名称排除列表 */
+    private List <String> productNameNotList;
+    /** 开始 设备来源(0.子设备，1.网关设备，2.直连设备) */
+    private Integer deviceSrcStart;
+
+    /** 结束 设备来源(0.子设备，1.网关设备，2.直连设备) */
+    private Integer deviceSrcEnd;
+
+    /** 增加 设备来源(0.子设备，1.网关设备，2.直连设备) */
+    private Integer deviceSrcIncrement;
+
+    /** 设备来源(0.子设备，1.网关设备，2.直连设备)列表 */
+    private List <Integer> deviceSrcList;
+
+    /** 设备来源(0.子设备，1.网关设备，2.直连设备)排除列表 */
+    private List <Integer> deviceSrcNotList;
+
+    /** 经度 */
+    private List<String> lonList;
+
+    /** 经度排除列表 */
+    private List <String> lonNotList;
+    /** 纬度 */
+    private List<String> latiList;
+
+    /** 纬度排除列表 */
+    private List <String> latiNotList;
+    /** 负责人 */
+    private List<String> leadingOfficialList;
+
+    /** 负责人排除列表 */
+    private List <String> leadingOfficialNotList;
+    /** 联系电话 */
+    private List<String> leadingOfficialTelephoneList;
+
+    /** 联系电话排除列表 */
+    private List <String> leadingOfficialTelephoneNotList;
+    /** 开始 设备状态 (0.未激活，1.离线,2.在线) */
+    private Integer deviceStatusStart;
+
+    /** 结束 设备状态 (0.未激活，1.离线,2.在线) */
+    private Integer deviceStatusEnd;
+
+    /** 增加 设备状态 (0.未激活，1.离线,2.在线) */
+    private Integer deviceStatusIncrement;
+
+    /** 设备状态 (0.未激活，1.离线,2.在线)列表 */
+    private List <Integer> deviceStatusList;
+
+    /** 设备状态 (0.未激活，1.离线,2.在线)排除列表 */
+    private List <Integer> deviceStatusNotList;
+
+    /** 备注 */
+    private List<String> deviceRemarkList;
+
+    /** 备注排除列表 */
+    private List <String> deviceRemarkNotList;
+    /** 开始 设备来源(0.旧设备，1.新设备) */
+    private Integer sourceStart;
+
+    /** 结束 设备来源(0.旧设备，1.新设备) */
+    private Integer sourceEnd;
+
+    /** 增加 设备来源(0.旧设备，1.新设备) */
+    private Integer sourceIncrement;
+
+    /** 设备来源(0.旧设备，1.新设备)列表 */
+    private List <Integer> sourceList;
+
+    /** 设备来源(0.旧设备，1.新设备)排除列表 */
+    private List <Integer> sourceNotList;
+
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 创建用户排除列表 */
+    private List <Long> createUserIdNotList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 更新用户 */
+    private Long updateUserIdStart;
+
+    /** 结束 更新用户 */
+    private Long updateUserIdEnd;
+
+    /** 增加 更新用户 */
+    private Long updateUserIdIncrement;
+
+    /** 更新用户列表 */
+    private List <Long> updateUserIdList;
+
+    /** 更新用户排除列表 */
+    private List <Long> updateUserIdNotList;
+
+    /** 开始 更新时间 */
+    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<DeviceQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<DeviceQuery> andConditionList;
+
+    public DeviceQuery(){}
+
+    /**
+    * 获取 开始 主键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;
+    }
+
+    /**
+    * 获取 主键ID，主键，自增长
+    * @return idNotList
+    */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+    * 设置 主键ID，主键，自增长
+    * @param idNotList
+    */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
+    /**
+    * 获取 开始 设备id
+    * @return deviceIdStart
+    */
+    public Long getDeviceIdStart(){
+        return this.deviceIdStart;
+    }
+
+    /**
+    * 设置 开始 设备id
+    * @param deviceIdStart
+    */
+    public void setDeviceIdStart(Long deviceIdStart){
+        this.deviceIdStart = deviceIdStart;
+    }
+
+    /**
+    * 获取 结束 设备id
+    * @return $deviceIdEnd
+    */
+    public Long getDeviceIdEnd(){
+        return this.deviceIdEnd;
+    }
+
+    /**
+    * 设置 结束 设备id
+    * @param deviceIdEnd
+    */
+    public void setDeviceIdEnd(Long deviceIdEnd){
+        this.deviceIdEnd = deviceIdEnd;
+    }
+
+    /**
+    * 获取 增加 设备id
+    * @return deviceIdIncrement
+    */
+    public Long getDeviceIdIncrement(){
+        return this.deviceIdIncrement;
+    }
+
+    /**
+    * 设置 增加 设备id
+    * @param deviceIdIncrement
+    */
+    public void setDeviceIdIncrement(Long deviceIdIncrement){
+        this.deviceIdIncrement = deviceIdIncrement;
+    }
+
+    /**
+    * 获取 设备id
+    * @return deviceIdList
+    */
+    public List<Long> getDeviceIdList(){
+        return this.deviceIdList;
+    }
+
+    /**
+    * 设置 设备id
+    * @param deviceIdList
+    */
+    public void setDeviceIdList(List<Long> deviceIdList){
+        this.deviceIdList = deviceIdList;
+    }
+
+    /**
+    * 获取 设备id
+    * @return deviceIdNotList
+    */
+    public List<Long> getDeviceIdNotList(){
+        return this.deviceIdNotList;
+    }
+
+    /**
+    * 设置 设备id
+    * @param deviceIdNotList
+    */
+    public void setDeviceIdNotList(List<Long> deviceIdNotList){
+        this.deviceIdNotList = deviceIdNotList;
+    }
+
+
+    /**
+    * 获取 设备名称
+    * @return deviceNameList
+    */
+    public List<String> getDeviceNameList(){
+        return this.deviceNameList;
+    }
+
+    /**
+    * 设置 设备名称
+    * @param deviceNameList
+    */
+    public void setDeviceNameList(List<String> deviceNameList){
+        this.deviceNameList = deviceNameList;
+    }
+
+    /**
+    * 获取 设备名称
+    * @return deviceNameNotList
+    */
+    public List<String> getDeviceNameNotList(){
+        return this.deviceNameNotList;
+    }
+
+    /**
+    * 设置 设备名称
+    * @param deviceNameNotList
+    */
+    public void setDeviceNameNotList(List<String> deviceNameNotList){
+        this.deviceNameNotList = deviceNameNotList;
+    }
+
+    /**
+    * 获取 设备编码
+    * @return deviceCodeList
+    */
+    public List<String> getDeviceCodeList(){
+        return this.deviceCodeList;
+    }
+
+    /**
+    * 设置 设备编码
+    * @param deviceCodeList
+    */
+    public void setDeviceCodeList(List<String> deviceCodeList){
+        this.deviceCodeList = deviceCodeList;
+    }
+
+    /**
+    * 获取 设备编码
+    * @return deviceCodeNotList
+    */
+    public List<String> getDeviceCodeNotList(){
+        return this.deviceCodeNotList;
+    }
+
+    /**
+    * 设置 设备编码
+    * @param deviceCodeNotList
+    */
+    public void setDeviceCodeNotList(List<String> deviceCodeNotList){
+        this.deviceCodeNotList = deviceCodeNotList;
+    }
+
+    /**
+    * 获取 设备的MAC地址
+    * @return deviceMacList
+    */
+    public List<String> getDeviceMacList(){
+        return this.deviceMacList;
+    }
+
+    /**
+    * 设置 设备的MAC地址
+    * @param deviceMacList
+    */
+    public void setDeviceMacList(List<String> deviceMacList){
+        this.deviceMacList = deviceMacList;
+    }
+
+    /**
+    * 获取 设备的MAC地址
+    * @return deviceMacNotList
+    */
+    public List<String> getDeviceMacNotList(){
+        return this.deviceMacNotList;
+    }
+
+    /**
+    * 设置 设备的MAC地址
+    * @param deviceMacNotList
+    */
+    public void setDeviceMacNotList(List<String> deviceMacNotList){
+        this.deviceMacNotList = deviceMacNotList;
+    }
+
+    /**
+    * 获取 开始 站点Id
+    * @return siteIdStart
+    */
+    public Long getSiteIdStart(){
+        return this.siteIdStart;
+    }
+
+    /**
+    * 设置 开始 站点Id
+    * @param siteIdStart
+    */
+    public void setSiteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+    }
+
+    /**
+    * 获取 结束 站点Id
+    * @return $siteIdEnd
+    */
+    public Long getSiteIdEnd(){
+        return this.siteIdEnd;
+    }
+
+    /**
+    * 设置 结束 站点Id
+    * @param siteIdEnd
+    */
+    public void setSiteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+    }
+
+    /**
+    * 获取 增加 站点Id
+    * @return siteIdIncrement
+    */
+    public Long getSiteIdIncrement(){
+        return this.siteIdIncrement;
+    }
+
+    /**
+    * 设置 增加 站点Id
+    * @param siteIdIncrement
+    */
+    public void setSiteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+    }
+
+    /**
+    * 获取 站点Id
+    * @return siteIdList
+    */
+    public List<Long> getSiteIdList(){
+        return this.siteIdList;
+    }
+
+    /**
+    * 设置 站点Id
+    * @param siteIdList
+    */
+    public void setSiteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+    }
+
+    /**
+    * 获取 站点Id
+    * @return siteIdNotList
+    */
+    public List<Long> getSiteIdNotList(){
+        return this.siteIdNotList;
+    }
+
+    /**
+    * 设置 站点Id
+    * @param siteIdNotList
+    */
+    public void setSiteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+    }
+
+
+    /**
+    * 获取 站点编号，来源基础服务平台
+    * @return siteCodeList
+    */
+    public List<String> getSiteCodeList(){
+        return this.siteCodeList;
+    }
+
+    /**
+    * 设置 站点编号，来源基础服务平台
+    * @param siteCodeList
+    */
+    public void setSiteCodeList(List<String> siteCodeList){
+        this.siteCodeList = siteCodeList;
+    }
+
+    /**
+    * 获取 站点编号，来源基础服务平台
+    * @return siteCodeNotList
+    */
+    public List<String> getSiteCodeNotList(){
+        return this.siteCodeNotList;
+    }
+
+    /**
+    * 设置 站点编号，来源基础服务平台
+    * @param siteCodeNotList
+    */
+    public void setSiteCodeNotList(List<String> siteCodeNotList){
+        this.siteCodeNotList = siteCodeNotList;
+    }
+
+    /**
+    * 获取 站点名称
+    * @return siteNameList
+    */
+    public List<String> getSiteNameList(){
+        return this.siteNameList;
+    }
+
+    /**
+    * 设置 站点名称
+    * @param siteNameList
+    */
+    public void setSiteNameList(List<String> siteNameList){
+        this.siteNameList = siteNameList;
+    }
+
+    /**
+    * 获取 站点名称
+    * @return siteNameNotList
+    */
+    public List<String> getSiteNameNotList(){
+        return this.siteNameNotList;
+    }
+
+    /**
+    * 设置 站点名称
+    * @param siteNameNotList
+    */
+    public void setSiteNameNotList(List<String> siteNameNotList){
+        this.siteNameNotList = siteNameNotList;
+    }
+
+    /**
+    * 获取 产品编码
+    * @return productCodeList
+    */
+    public List<String> getProductCodeList(){
+        return this.productCodeList;
+    }
+
+    /**
+    * 设置 产品编码
+    * @param productCodeList
+    */
+    public void setProductCodeList(List<String> productCodeList){
+        this.productCodeList = productCodeList;
+    }
+
+    /**
+    * 获取 产品编码
+    * @return productCodeNotList
+    */
+    public List<String> getProductCodeNotList(){
+        return this.productCodeNotList;
+    }
+
+    /**
+    * 设置 产品编码
+    * @param productCodeNotList
+    */
+    public void setProductCodeNotList(List<String> productCodeNotList){
+        this.productCodeNotList = productCodeNotList;
+    }
+
+    /**
+    * 获取 产品名称
+    * @return productNameList
+    */
+    public List<String> getProductNameList(){
+        return this.productNameList;
+    }
+
+    /**
+    * 设置 产品名称
+    * @param productNameList
+    */
+    public void setProductNameList(List<String> productNameList){
+        this.productNameList = productNameList;
+    }
+
+    /**
+    * 获取 产品名称
+    * @return productNameNotList
+    */
+    public List<String> getProductNameNotList(){
+        return this.productNameNotList;
+    }
+
+    /**
+    * 设置 产品名称
+    * @param productNameNotList
+    */
+    public void setProductNameNotList(List<String> productNameNotList){
+        this.productNameNotList = productNameNotList;
+    }
+
+    /**
+    * 获取 开始 设备来源(0.子设备，1.网关设备，2.直连设备)
+    * @return deviceSrcStart
+    */
+    public Integer getDeviceSrcStart(){
+        return this.deviceSrcStart;
+    }
+
+    /**
+    * 设置 开始 设备来源(0.子设备，1.网关设备，2.直连设备)
+    * @param deviceSrcStart
+    */
+    public void setDeviceSrcStart(Integer deviceSrcStart){
+        this.deviceSrcStart = deviceSrcStart;
+    }
+
+    /**
+    * 获取 结束 设备来源(0.子设备，1.网关设备，2.直连设备)
+    * @return $deviceSrcEnd
+    */
+    public Integer getDeviceSrcEnd(){
+        return this.deviceSrcEnd;
+    }
+
+    /**
+    * 设置 结束 设备来源(0.子设备，1.网关设备，2.直连设备)
+    * @param deviceSrcEnd
+    */
+    public void setDeviceSrcEnd(Integer deviceSrcEnd){
+        this.deviceSrcEnd = deviceSrcEnd;
+    }
+
+    /**
+    * 获取 增加 设备来源(0.子设备，1.网关设备，2.直连设备)
+    * @return deviceSrcIncrement
+    */
+    public Integer getDeviceSrcIncrement(){
+        return this.deviceSrcIncrement;
+    }
+
+    /**
+    * 设置 增加 设备来源(0.子设备，1.网关设备，2.直连设备)
+    * @param deviceSrcIncrement
+    */
+    public void setDeviceSrcIncrement(Integer deviceSrcIncrement){
+        this.deviceSrcIncrement = deviceSrcIncrement;
+    }
+
+    /**
+    * 获取 设备来源(0.子设备，1.网关设备，2.直连设备)
+    * @return deviceSrcList
+    */
+    public List<Integer> getDeviceSrcList(){
+        return this.deviceSrcList;
+    }
+
+    /**
+    * 设置 设备来源(0.子设备，1.网关设备，2.直连设备)
+    * @param deviceSrcList
+    */
+    public void setDeviceSrcList(List<Integer> deviceSrcList){
+        this.deviceSrcList = deviceSrcList;
+    }
+
+    /**
+    * 获取 设备来源(0.子设备，1.网关设备，2.直连设备)
+    * @return deviceSrcNotList
+    */
+    public List<Integer> getDeviceSrcNotList(){
+        return this.deviceSrcNotList;
+    }
+
+    /**
+    * 设置 设备来源(0.子设备，1.网关设备，2.直连设备)
+    * @param deviceSrcNotList
+    */
+    public void setDeviceSrcNotList(List<Integer> deviceSrcNotList){
+        this.deviceSrcNotList = deviceSrcNotList;
+    }
+
+
+    /**
+    * 获取 经度
+    * @return lonList
+    */
+    public List<String> getLonList(){
+        return this.lonList;
+    }
+
+    /**
+    * 设置 经度
+    * @param lonList
+    */
+    public void setLonList(List<String> lonList){
+        this.lonList = lonList;
+    }
+
+    /**
+    * 获取 经度
+    * @return lonNotList
+    */
+    public List<String> getLonNotList(){
+        return this.lonNotList;
+    }
+
+    /**
+    * 设置 经度
+    * @param lonNotList
+    */
+    public void setLonNotList(List<String> lonNotList){
+        this.lonNotList = lonNotList;
+    }
+
+    /**
+    * 获取 纬度
+    * @return latiList
+    */
+    public List<String> getLatiList(){
+        return this.latiList;
+    }
+
+    /**
+    * 设置 纬度
+    * @param latiList
+    */
+    public void setLatiList(List<String> latiList){
+        this.latiList = latiList;
+    }
+
+    /**
+    * 获取 纬度
+    * @return latiNotList
+    */
+    public List<String> getLatiNotList(){
+        return this.latiNotList;
+    }
+
+    /**
+    * 设置 纬度
+    * @param latiNotList
+    */
+    public void setLatiNotList(List<String> latiNotList){
+        this.latiNotList = latiNotList;
+    }
+
+    /**
+    * 获取 负责人
+    * @return leadingOfficialList
+    */
+    public List<String> getLeadingOfficialList(){
+        return this.leadingOfficialList;
+    }
+
+    /**
+    * 设置 负责人
+    * @param leadingOfficialList
+    */
+    public void setLeadingOfficialList(List<String> leadingOfficialList){
+        this.leadingOfficialList = leadingOfficialList;
+    }
+
+    /**
+    * 获取 负责人
+    * @return leadingOfficialNotList
+    */
+    public List<String> getLeadingOfficialNotList(){
+        return this.leadingOfficialNotList;
+    }
+
+    /**
+    * 设置 负责人
+    * @param leadingOfficialNotList
+    */
+    public void setLeadingOfficialNotList(List<String> leadingOfficialNotList){
+        this.leadingOfficialNotList = leadingOfficialNotList;
+    }
+
+    /**
+    * 获取 联系电话
+    * @return leadingOfficialTelephoneList
+    */
+    public List<String> getLeadingOfficialTelephoneList(){
+        return this.leadingOfficialTelephoneList;
+    }
+
+    /**
+    * 设置 联系电话
+    * @param leadingOfficialTelephoneList
+    */
+    public void setLeadingOfficialTelephoneList(List<String> leadingOfficialTelephoneList){
+        this.leadingOfficialTelephoneList = leadingOfficialTelephoneList;
+    }
+
+    /**
+    * 获取 联系电话
+    * @return leadingOfficialTelephoneNotList
+    */
+    public List<String> getLeadingOfficialTelephoneNotList(){
+        return this.leadingOfficialTelephoneNotList;
+    }
+
+    /**
+    * 设置 联系电话
+    * @param leadingOfficialTelephoneNotList
+    */
+    public void setLeadingOfficialTelephoneNotList(List<String> leadingOfficialTelephoneNotList){
+        this.leadingOfficialTelephoneNotList = leadingOfficialTelephoneNotList;
+    }
+
+    /**
+    * 获取 开始 设备状态 (0.未激活，1.离线,2.在线)
+    * @return deviceStatusStart
+    */
+    public Integer getDeviceStatusStart(){
+        return this.deviceStatusStart;
+    }
+
+    /**
+    * 设置 开始 设备状态 (0.未激活，1.离线,2.在线)
+    * @param deviceStatusStart
+    */
+    public void setDeviceStatusStart(Integer deviceStatusStart){
+        this.deviceStatusStart = deviceStatusStart;
+    }
+
+    /**
+    * 获取 结束 设备状态 (0.未激活，1.离线,2.在线)
+    * @return $deviceStatusEnd
+    */
+    public Integer getDeviceStatusEnd(){
+        return this.deviceStatusEnd;
+    }
+
+    /**
+    * 设置 结束 设备状态 (0.未激活，1.离线,2.在线)
+    * @param deviceStatusEnd
+    */
+    public void setDeviceStatusEnd(Integer deviceStatusEnd){
+        this.deviceStatusEnd = deviceStatusEnd;
+    }
+
+    /**
+    * 获取 增加 设备状态 (0.未激活，1.离线,2.在线)
+    * @return deviceStatusIncrement
+    */
+    public Integer getDeviceStatusIncrement(){
+        return this.deviceStatusIncrement;
+    }
+
+    /**
+    * 设置 增加 设备状态 (0.未激活，1.离线,2.在线)
+    * @param deviceStatusIncrement
+    */
+    public void setDeviceStatusIncrement(Integer deviceStatusIncrement){
+        this.deviceStatusIncrement = deviceStatusIncrement;
+    }
+
+    /**
+    * 获取 设备状态 (0.未激活，1.离线,2.在线)
+    * @return deviceStatusList
+    */
+    public List<Integer> getDeviceStatusList(){
+        return this.deviceStatusList;
+    }
+
+    /**
+    * 设置 设备状态 (0.未激活，1.离线,2.在线)
+    * @param deviceStatusList
+    */
+    public void setDeviceStatusList(List<Integer> deviceStatusList){
+        this.deviceStatusList = deviceStatusList;
+    }
+
+    /**
+    * 获取 设备状态 (0.未激活，1.离线,2.在线)
+    * @return deviceStatusNotList
+    */
+    public List<Integer> getDeviceStatusNotList(){
+        return this.deviceStatusNotList;
+    }
+
+    /**
+    * 设置 设备状态 (0.未激活，1.离线,2.在线)
+    * @param deviceStatusNotList
+    */
+    public void setDeviceStatusNotList(List<Integer> deviceStatusNotList){
+        this.deviceStatusNotList = deviceStatusNotList;
+    }
+
+
+    /**
+    * 获取 备注
+    * @return deviceRemarkList
+    */
+    public List<String> getDeviceRemarkList(){
+        return this.deviceRemarkList;
+    }
+
+    /**
+    * 设置 备注
+    * @param deviceRemarkList
+    */
+    public void setDeviceRemarkList(List<String> deviceRemarkList){
+        this.deviceRemarkList = deviceRemarkList;
+    }
+
+    /**
+    * 获取 备注
+    * @return deviceRemarkNotList
+    */
+    public List<String> getDeviceRemarkNotList(){
+        return this.deviceRemarkNotList;
+    }
+
+    /**
+    * 设置 备注
+    * @param deviceRemarkNotList
+    */
+    public void setDeviceRemarkNotList(List<String> deviceRemarkNotList){
+        this.deviceRemarkNotList = deviceRemarkNotList;
+    }
+
+    /**
+    * 获取 开始 设备来源(0.旧设备，1.新设备)
+    * @return sourceStart
+    */
+    public Integer getSourceStart(){
+        return this.sourceStart;
+    }
+
+    /**
+    * 设置 开始 设备来源(0.旧设备，1.新设备)
+    * @param sourceStart
+    */
+    public void setSourceStart(Integer sourceStart){
+        this.sourceStart = sourceStart;
+    }
+
+    /**
+    * 获取 结束 设备来源(0.旧设备，1.新设备)
+    * @return $sourceEnd
+    */
+    public Integer getSourceEnd(){
+        return this.sourceEnd;
+    }
+
+    /**
+    * 设置 结束 设备来源(0.旧设备，1.新设备)
+    * @param sourceEnd
+    */
+    public void setSourceEnd(Integer sourceEnd){
+        this.sourceEnd = sourceEnd;
+    }
+
+    /**
+    * 获取 增加 设备来源(0.旧设备，1.新设备)
+    * @return sourceIncrement
+    */
+    public Integer getSourceIncrement(){
+        return this.sourceIncrement;
+    }
+
+    /**
+    * 设置 增加 设备来源(0.旧设备，1.新设备)
+    * @param sourceIncrement
+    */
+    public void setSourceIncrement(Integer sourceIncrement){
+        this.sourceIncrement = sourceIncrement;
+    }
+
+    /**
+    * 获取 设备来源(0.旧设备，1.新设备)
+    * @return sourceList
+    */
+    public List<Integer> getSourceList(){
+        return this.sourceList;
+    }
+
+    /**
+    * 设置 设备来源(0.旧设备，1.新设备)
+    * @param sourceList
+    */
+    public void setSourceList(List<Integer> sourceList){
+        this.sourceList = sourceList;
+    }
+
+    /**
+    * 获取 设备来源(0.旧设备，1.新设备)
+    * @return sourceNotList
+    */
+    public List<Integer> getSourceNotList(){
+        return this.sourceNotList;
+    }
+
+    /**
+    * 设置 设备来源(0.旧设备，1.新设备)
+    * @param sourceNotList
+    */
+    public void setSourceNotList(List<Integer> sourceNotList){
+        this.sourceNotList = sourceNotList;
+    }
+
+
+    /**
+    * 获取 开始 创建用户
+    * @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 createUserIdNotList
+    */
+    public List<Long> getCreateUserIdNotList(){
+        return this.createUserIdNotList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdNotList
+    */
+    public void setCreateUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 创建时间
+    * @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 updateUserIdNotList
+    */
+    public List<Long> getUpdateUserIdNotList(){
+        return this.updateUserIdNotList;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdNotList
+    */
+    public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 更新时间
+    * @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 DeviceQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 主键ID，主键，自增长
+    * @param idStart
+    */
+    public DeviceQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 主键ID，主键，自增长
+    * @param idEnd
+    */
+    public DeviceQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 主键ID，主键，自增长
+    * @param idIncrement
+    */
+    public DeviceQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 主键ID，主键，自增长
+    * @param idList
+    */
+    public DeviceQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+        /**
+        * 设置 主键ID，主键，自增长
+        * @param idNotList
+        */
+        public DeviceQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+        }
+
+    /**
+    * 设置  设备id
+    * @param deviceId
+    */
+    public DeviceQuery deviceId(Long deviceId){
+	    setDeviceId(deviceId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 设备id
+    * @param deviceIdStart
+    */
+    public DeviceQuery deviceIdStart(Long deviceIdStart){
+		this.deviceIdStart = deviceIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 设备id
+    * @param deviceIdEnd
+    */
+    public DeviceQuery deviceIdEnd(Long deviceIdEnd){
+		this.deviceIdEnd = deviceIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 设备id
+    * @param deviceIdIncrement
+    */
+    public DeviceQuery deviceIdIncrement(Long deviceIdIncrement){
+		this.deviceIdIncrement = deviceIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 设备id
+    * @param deviceIdList
+    */
+    public DeviceQuery deviceIdList(List<Long> deviceIdList){
+        this.deviceIdList = deviceIdList;
+		return this;
+        }
+
+        /**
+        * 设置 设备id
+        * @param deviceIdNotList
+        */
+        public DeviceQuery deviceIdNotList(List<Long> deviceIdNotList){
+        this.deviceIdNotList = deviceIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 设备名称
+    * @param deviceName
+    */
+    public DeviceQuery deviceName(String deviceName){
+        setDeviceName(deviceName);
+		return this;
+    }
+
+    /**
+    * 设置 设备名称
+    * @param deviceNameList
+    */
+    public DeviceQuery deviceNameList(List<String> deviceNameList){
+        this.deviceNameList = deviceNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 设备编码
+    * @param deviceCode
+    */
+    public DeviceQuery deviceCode(String deviceCode){
+        setDeviceCode(deviceCode);
+		return this;
+    }
+
+    /**
+    * 设置 设备编码
+    * @param deviceCodeList
+    */
+    public DeviceQuery deviceCodeList(List<String> deviceCodeList){
+        this.deviceCodeList = deviceCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 设备的MAC地址
+    * @param deviceMac
+    */
+    public DeviceQuery deviceMac(String deviceMac){
+        setDeviceMac(deviceMac);
+		return this;
+    }
+
+    /**
+    * 设置 设备的MAC地址
+    * @param deviceMacList
+    */
+    public DeviceQuery deviceMacList(List<String> deviceMacList){
+        this.deviceMacList = deviceMacList;
+		return this;
+    }
+
+    /**
+    * 设置  站点Id
+    * @param siteId
+    */
+    public DeviceQuery siteId(Long siteId){
+	    setSiteId(siteId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 站点Id
+    * @param siteIdStart
+    */
+    public DeviceQuery siteIdStart(Long siteIdStart){
+		this.siteIdStart = siteIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 站点Id
+    * @param siteIdEnd
+    */
+    public DeviceQuery siteIdEnd(Long siteIdEnd){
+		this.siteIdEnd = siteIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 站点Id
+    * @param siteIdIncrement
+    */
+    public DeviceQuery siteIdIncrement(Long siteIdIncrement){
+		this.siteIdIncrement = siteIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 站点Id
+    * @param siteIdList
+    */
+    public DeviceQuery siteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+		return this;
+        }
+
+        /**
+        * 设置 站点Id
+        * @param siteIdNotList
+        */
+        public DeviceQuery siteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 站点编号，来源基础服务平台
+    * @param siteCode
+    */
+    public DeviceQuery siteCode(String siteCode){
+        setSiteCode(siteCode);
+		return this;
+    }
+
+    /**
+    * 设置 站点编号，来源基础服务平台
+    * @param siteCodeList
+    */
+    public DeviceQuery siteCodeList(List<String> siteCodeList){
+        this.siteCodeList = siteCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 站点名称
+    * @param siteName
+    */
+    public DeviceQuery siteName(String siteName){
+        setSiteName(siteName);
+		return this;
+    }
+
+    /**
+    * 设置 站点名称
+    * @param siteNameList
+    */
+    public DeviceQuery siteNameList(List<String> siteNameList){
+        this.siteNameList = siteNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 产品编码
+    * @param productCode
+    */
+    public DeviceQuery productCode(String productCode){
+        setProductCode(productCode);
+		return this;
+    }
+
+    /**
+    * 设置 产品编码
+    * @param productCodeList
+    */
+    public DeviceQuery productCodeList(List<String> productCodeList){
+        this.productCodeList = productCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 产品名称
+    * @param productName
+    */
+    public DeviceQuery productName(String productName){
+        setProductName(productName);
+		return this;
+    }
+
+    /**
+    * 设置 产品名称
+    * @param productNameList
+    */
+    public DeviceQuery productNameList(List<String> productNameList){
+        this.productNameList = productNameList;
+		return this;
+    }
+
+    /**
+    * 设置  设备来源(0.子设备，1.网关设备，2.直连设备)
+    * @param deviceSrc
+    */
+    public DeviceQuery deviceSrc(Integer deviceSrc){
+	    setDeviceSrc(deviceSrc);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 设备来源(0.子设备，1.网关设备，2.直连设备)
+    * @param deviceSrcStart
+    */
+    public DeviceQuery deviceSrcStart(Integer deviceSrcStart){
+		this.deviceSrcStart = deviceSrcStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 设备来源(0.子设备，1.网关设备，2.直连设备)
+    * @param deviceSrcEnd
+    */
+    public DeviceQuery deviceSrcEnd(Integer deviceSrcEnd){
+		this.deviceSrcEnd = deviceSrcEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 设备来源(0.子设备，1.网关设备，2.直连设备)
+    * @param deviceSrcIncrement
+    */
+    public DeviceQuery deviceSrcIncrement(Integer deviceSrcIncrement){
+		this.deviceSrcIncrement = deviceSrcIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 设备来源(0.子设备，1.网关设备，2.直连设备)
+    * @param deviceSrcList
+    */
+    public DeviceQuery deviceSrcList(List<Integer> deviceSrcList){
+        this.deviceSrcList = deviceSrcList;
+		return this;
+        }
+
+        /**
+        * 设置 设备来源(0.子设备，1.网关设备，2.直连设备)
+        * @param deviceSrcNotList
+        */
+        public DeviceQuery deviceSrcNotList(List<Integer> deviceSrcNotList){
+        this.deviceSrcNotList = deviceSrcNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 经度
+    * @param lon
+    */
+    public DeviceQuery lon(String lon){
+        setLon(lon);
+		return this;
+    }
+
+    /**
+    * 设置 经度
+    * @param lonList
+    */
+    public DeviceQuery lonList(List<String> lonList){
+        this.lonList = lonList;
+		return this;
+    }
+
+
+	/**
+    * 设置 纬度
+    * @param lati
+    */
+    public DeviceQuery lati(String lati){
+        setLati(lati);
+		return this;
+    }
+
+    /**
+    * 设置 纬度
+    * @param latiList
+    */
+    public DeviceQuery latiList(List<String> latiList){
+        this.latiList = latiList;
+		return this;
+    }
+
+
+	/**
+    * 设置 负责人
+    * @param leadingOfficial
+    */
+    public DeviceQuery leadingOfficial(String leadingOfficial){
+        setLeadingOfficial(leadingOfficial);
+		return this;
+    }
+
+    /**
+    * 设置 负责人
+    * @param leadingOfficialList
+    */
+    public DeviceQuery leadingOfficialList(List<String> leadingOfficialList){
+        this.leadingOfficialList = leadingOfficialList;
+		return this;
+    }
+
+
+	/**
+    * 设置 联系电话
+    * @param leadingOfficialTelephone
+    */
+    public DeviceQuery leadingOfficialTelephone(String leadingOfficialTelephone){
+        setLeadingOfficialTelephone(leadingOfficialTelephone);
+		return this;
+    }
+
+    /**
+    * 设置 联系电话
+    * @param leadingOfficialTelephoneList
+    */
+    public DeviceQuery leadingOfficialTelephoneList(List<String> leadingOfficialTelephoneList){
+        this.leadingOfficialTelephoneList = leadingOfficialTelephoneList;
+		return this;
+    }
+
+    /**
+    * 设置  设备状态 (0.未激活，1.离线,2.在线)
+    * @param deviceStatus
+    */
+    public DeviceQuery deviceStatus(Integer deviceStatus){
+	    setDeviceStatus(deviceStatus);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 设备状态 (0.未激活，1.离线,2.在线)
+    * @param deviceStatusStart
+    */
+    public DeviceQuery deviceStatusStart(Integer deviceStatusStart){
+		this.deviceStatusStart = deviceStatusStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 设备状态 (0.未激活，1.离线,2.在线)
+    * @param deviceStatusEnd
+    */
+    public DeviceQuery deviceStatusEnd(Integer deviceStatusEnd){
+		this.deviceStatusEnd = deviceStatusEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 设备状态 (0.未激活，1.离线,2.在线)
+    * @param deviceStatusIncrement
+    */
+    public DeviceQuery deviceStatusIncrement(Integer deviceStatusIncrement){
+		this.deviceStatusIncrement = deviceStatusIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 设备状态 (0.未激活，1.离线,2.在线)
+    * @param deviceStatusList
+    */
+    public DeviceQuery deviceStatusList(List<Integer> deviceStatusList){
+        this.deviceStatusList = deviceStatusList;
+		return this;
+        }
+
+        /**
+        * 设置 设备状态 (0.未激活，1.离线,2.在线)
+        * @param deviceStatusNotList
+        */
+        public DeviceQuery deviceStatusNotList(List<Integer> deviceStatusNotList){
+        this.deviceStatusNotList = deviceStatusNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 备注
+    * @param deviceRemark
+    */
+    public DeviceQuery deviceRemark(String deviceRemark){
+        setDeviceRemark(deviceRemark);
+		return this;
+    }
+
+    /**
+    * 设置 备注
+    * @param deviceRemarkList
+    */
+    public DeviceQuery deviceRemarkList(List<String> deviceRemarkList){
+        this.deviceRemarkList = deviceRemarkList;
+		return this;
+    }
+
+    /**
+    * 设置  设备来源(0.旧设备，1.新设备)
+    * @param source
+    */
+    public DeviceQuery source(Integer source){
+	    setSource(source);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 设备来源(0.旧设备，1.新设备)
+    * @param sourceStart
+    */
+    public DeviceQuery sourceStart(Integer sourceStart){
+		this.sourceStart = sourceStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 设备来源(0.旧设备，1.新设备)
+    * @param sourceEnd
+    */
+    public DeviceQuery sourceEnd(Integer sourceEnd){
+		this.sourceEnd = sourceEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 设备来源(0.旧设备，1.新设备)
+    * @param sourceIncrement
+    */
+    public DeviceQuery sourceIncrement(Integer sourceIncrement){
+		this.sourceIncrement = sourceIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 设备来源(0.旧设备，1.新设备)
+    * @param sourceList
+    */
+    public DeviceQuery sourceList(List<Integer> sourceList){
+        this.sourceList = sourceList;
+		return this;
+        }
+
+        /**
+        * 设置 设备来源(0.旧设备，1.新设备)
+        * @param sourceNotList
+        */
+        public DeviceQuery sourceNotList(List<Integer> sourceNotList){
+        this.sourceNotList = sourceNotList;
+        return this;
+        }
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public DeviceQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public DeviceQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public DeviceQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public DeviceQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public DeviceQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 创建用户
+        * @param createUserIdNotList
+        */
+        public DeviceQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+        }
+
+
+    /**
+    * 设置  更新用户
+    * @param updateUserId
+    */
+    public DeviceQuery updateUserId(Long updateUserId){
+	    setUpdateUserId(updateUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public DeviceQuery updateUserIdStart(Long updateUserIdStart){
+		this.updateUserIdStart = updateUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public DeviceQuery updateUserIdEnd(Long updateUserIdEnd){
+		this.updateUserIdEnd = updateUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public DeviceQuery updateUserIdIncrement(Long updateUserIdIncrement){
+		this.updateUserIdIncrement = updateUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public DeviceQuery updateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 更新用户
+        * @param updateUserIdNotList
+        */
+        public DeviceQuery updateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+        return this;
+        }
+
+
+    /**
+    * 获取 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;
+    }
+
+    /**
+    * 设置 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
+    */
+    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
+    */
+    public void setAndConditionList(List<DeviceQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

base-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;
+
+/**
+* 设备视图对象
+*
+* @author zxfei
+* @date 2023-02-25
+*/
+public class DeviceVo extends BaseEntityLong {
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/device/service/DeviceService.java

+package com.mortals.xhx.module.device.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.device.model.DeviceEntity;
+/**
+* DeviceService
+*
+* 设备 service接口
+*
+* @author zxfei
+* @date 2023-02-25
+*/
+public interface DeviceService extends ICRUDService<DeviceEntity,Long>{
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceMatterDatumServiceImpl.java

+package com.mortals.xhx.module.device.service.impl;
+
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.dept.DeptPdu;
+import com.mortals.xhx.feign.dept.IDeptFeign;
+import com.mortals.xhx.module.device.dao.DeviceMatterDatumDao;
+import com.mortals.xhx.module.device.model.DeviceEntity;
+import com.mortals.xhx.module.device.model.DeviceMatterDatumEntity;
+import com.mortals.xhx.module.device.model.DeviceMatterDatumQuery;
+import com.mortals.xhx.module.device.service.DeviceMatterDatumService;
+import com.mortals.xhx.module.device.service.DeviceService;
+import com.mortals.xhx.module.matter.model.MatterDatumEntity;
+import com.mortals.xhx.module.matter.model.MatterDatumQuery;
+import com.mortals.xhx.module.matter.model.MatterEntity;
+import com.mortals.xhx.module.matter.service.MatterDatumService;
+import com.mortals.xhx.module.matter.service.MatterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+* DeviceMatterDatumService
+* 设备事项申请材料业务 service实现
+*
+* @author zxfei
+* @date 2023-02-25
+*/
+@Service("deviceMatterDatumService")
+public class DeviceMatterDatumServiceImpl extends AbstractCRUDServiceImpl<DeviceMatterDatumDao, DeviceMatterDatumEntity, Long> implements DeviceMatterDatumService {
+
+    @Autowired
+    private MatterService matterService;
+    @Autowired
+    private DeviceService deviceService;
+    @Autowired
+    private MatterDatumService matterDatumService;
+
+    @Autowired
+    private IDeptFeign deptFeign;
+
+
+    @Override
+    protected void findAfter(DeviceMatterDatumEntity params, PageInfo pageInfo, Context context, List<DeviceMatterDatumEntity> list) throws AppException {
+        //super.findAfter(params, pageInfo, context, list);
+        list.forEach(item->{
+            List<MatterDatumEntity> matterDatumEntities = matterDatumService.find(new MatterDatumQuery().matterId(item.getMatterId()));
+            if(!ObjectUtils.isEmpty(matterDatumEntities)){
+                item.setMatterDatumList(matterDatumEntities);
+            }else{
+                item.setMatterDatumList(new ArrayList<>());
+            }
+        });
+    }
+
+    @Override
+    protected void saveBefore(DeviceMatterDatumEntity entity, Context context) throws AppException {
+        super.saveBefore(entity, context);
+        int count = this.getDao().getCount(new DeviceMatterDatumQuery().deviceId(entity.getDeviceId()).matterId(entity.getMatterId()));
+        if(count>0){
+            throw new AppException("当前设备关联事项已存在，不能新增！");
+        }
+
+        if(!ObjectUtils.isEmpty(entity.getMatterId())){
+            MatterEntity matterEntity = matterService.get(entity.getMatterId());
+            if(!ObjectUtils.isEmpty(matterEntity)){
+                entity.setMatterCode(matterEntity.getMatterNo());
+                entity.setMatterName(matterEntity.getMatterName());
+                entity.setMateriaFullName(matterEntity.getMatterFullName());
+                entity.setIsRecommend(matterEntity.getIsRecommend());
+                entity.setSource(matterEntity.getSource());
+                entity.setSort(matterEntity.getSort());
+                entity.setDeptId(matterEntity.getDeptId());
+
+                DeptPdu deptPdu = new DeptPdu();
+                deptPdu.setDeptNumber(matterEntity.getDeptCode());
+                deptPdu.setSiteId(entity.getSiteId());
+                Rest<RespData<List<DeptPdu>>> rest = deptFeign.list(deptPdu);
+                if(YesNoEnum.YES.getValue()==rest.getCode()){
+                    List<DeptPdu> data = rest.getData().getData();
+                    if(!ObjectUtils.isEmpty(data)){
+                        entity.setDeptId(data.get(0).getId());
+                    }
+                }
+
+                entity.setDeptCode(matterEntity.getDeptCode());
+                entity.setDeptName(matterEntity.getDeptName());
+            }
+        }
+
+        if(!ObjectUtils.isEmpty(entity.getDeviceId())){
+            DeviceEntity deviceEntity = deviceService.get(entity.getDeviceId());
+            if(!ObjectUtils.isEmpty(deviceEntity)){
+                entity.setDeviceCode(deviceEntity.getDeviceCode());
+                entity.setDeviceName(deviceEntity.getDeviceName());
+            }
+        }
+
+    }
+
+
+    @Override
+    protected void updateBefore(DeviceMatterDatumEntity entity, Context context) throws AppException {
+        super.updateBefore(entity, context);
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java

+package com.mortals.xhx.module.device.service.impl;
+
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.device.dao.DeviceDao;
+import com.mortals.xhx.module.device.model.DeviceEntity;
+import com.mortals.xhx.module.device.service.DeviceService;
+import com.mortals.xhx.module.matter.service.MatterDatumService;
+import com.mortals.xhx.module.matter.service.MatterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+/**
+* DeviceService
+* 设备 service实现
+*
+* @author zxfei
+* @date 2023-02-25
+*/
+@Service("deviceService")
+public class DeviceServiceImpl extends AbstractCRUDServiceImpl<DeviceDao, DeviceEntity, Long> implements DeviceService {
+
+    @Autowired
+    private MatterService matterService;
+    @Autowired
+    private MatterDatumService matterDatumService;
+
+    @Override
+    protected void saveBefore(DeviceEntity entity, Context context) throws AppException {
+        super.saveBefore(entity, context);
+    }
+}
\ No newline at end of file

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

+package com.mortals.xhx.module.device.web;
+
+import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.device.model.DeviceEntity;
+import com.mortals.xhx.module.device.service.DeviceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+*
+* 设备
+*
+* @author zxfei
+* @date 2023-02-25
+*/
+@RestController
+@RequestMapping("device")
+public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceService,DeviceEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public DeviceController(){
+        super.setModuleDesc( "设备");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "deviceSrc", paramService.getParamBySecondOrganize("Device","deviceSrc"));
+        this.addDict(model, "deviceStatus", paramService.getParamBySecondOrganize("Device","deviceStatus"));
+        this.addDict(model, "source", paramService.getParamBySecondOrganize("Device","source"));
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

base-manager/src/main/resources/sqlmap/module/device/DeviceMapper.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.device.dao.ibatis.DeviceDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="DeviceEntity" id="DeviceEntity-Map">
+            <id  property="id" column="id" />
+            <result property="deviceId" column="deviceId" />
+            <result property="deviceName" column="deviceName" />
+            <result property="deviceCode" column="deviceCode" />
+            <result property="deviceMac" column="deviceMac" />
+            <result property="siteId" column="siteId" />
+            <result property="siteCode" column="siteCode" />
+            <result property="siteName" column="siteName" />
+            <result property="productCode" column="productCode" />
+            <result property="productName" column="productName" />
+            <result property="deviceSrc" column="deviceSrc" />
+            <result property="lon" column="lon" />
+            <result property="lati" column="lati" />
+            <result property="leadingOfficial" column="leadingOfficial" />
+            <result property="leadingOfficialTelephone" column="leadingOfficialTelephone" />
+            <result property="deviceStatus" column="deviceStatus" />
+            <result property="deviceRemark" column="deviceRemark" />
+            <result property="source" column="source" />
+            <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('deviceName') or colPickMode == 1 and data.containsKey('deviceName')))">
+                    a.deviceName,
+                </if>
+                <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('deviceMac') or colPickMode == 1 and data.containsKey('deviceMac')))">
+                    a.deviceMac,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
+                    a.siteId,
+                </if>
+                <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('productCode') or colPickMode == 1 and data.containsKey('productCode')))">
+                    a.productCode,
+                </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('deviceSrc') or colPickMode == 1 and data.containsKey('deviceSrc')))">
+                    a.deviceSrc,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('lon') or colPickMode == 1 and data.containsKey('lon')))">
+                    a.lon,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('lati') or colPickMode == 1 and data.containsKey('lati')))">
+                    a.lati,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('leadingOfficial') or colPickMode == 1 and data.containsKey('leadingOfficial')))">
+                    a.leadingOfficial,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('leadingOfficialTelephone') or colPickMode == 1 and data.containsKey('leadingOfficialTelephone')))">
+                    a.leadingOfficialTelephone,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceStatus') or colPickMode == 1 and data.containsKey('deviceStatus')))">
+                    a.deviceStatus,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceRemark') or colPickMode == 1 and data.containsKey('deviceRemark')))">
+                    a.deviceRemark,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))">
+                    a.source,
+                </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="DeviceEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_device
+        (deviceId,deviceName,deviceCode,deviceMac,siteId,siteCode,siteName,productCode,productName,deviceSrc,lon,lati,leadingOfficial,leadingOfficialTelephone,deviceStatus,deviceRemark,source,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        (#{deviceId},#{deviceName},#{deviceCode},#{deviceMac},#{siteId},#{siteCode},#{siteName},#{productCode},#{productName},#{deviceSrc},#{lon},#{lati},#{leadingOfficial},#{leadingOfficialTelephone},#{deviceStatus},#{deviceRemark},#{source},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_xhx_device
+        (deviceId,deviceName,deviceCode,deviceMac,siteId,siteCode,siteName,productCode,productName,deviceSrc,lon,lati,leadingOfficial,leadingOfficialTelephone,deviceStatus,deviceRemark,source,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.deviceId},#{item.deviceName},#{item.deviceCode},#{item.deviceMac},#{item.siteId},#{item.siteCode},#{item.siteName},#{item.productCode},#{item.productName},#{item.deviceSrc},#{item.lon},#{item.lati},#{item.leadingOfficial},#{item.leadingOfficialTelephone},#{item.deviceStatus},#{item.deviceRemark},#{item.source},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_xhx_device as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('deviceId')) or (colPickMode==1 and !data.containsKey('deviceId'))">
+                a.deviceId=#{data.deviceId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('deviceIdIncrement')) or (colPickMode==1 and !data.containsKey('deviceIdIncrement'))">
+                a.deviceId=ifnull(a.deviceId,0) + #{data.deviceIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('deviceName')) or (colPickMode==1 and !data.containsKey('deviceName'))">
+                a.deviceName=#{data.deviceName},
+            </if>
+            <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('deviceMac')) or (colPickMode==1 and !data.containsKey('deviceMac'))">
+                a.deviceMac=#{data.deviceMac},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
+                a.siteId=#{data.siteId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
+                a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
+            </if>
+            <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('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))">
+                a.siteName=#{data.siteName},
+            </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('productName')) or (colPickMode==1 and !data.containsKey('productName'))">
+                a.productName=#{data.productName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('deviceSrc')) or (colPickMode==1 and !data.containsKey('deviceSrc'))">
+                a.deviceSrc=#{data.deviceSrc},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('deviceSrcIncrement')) or (colPickMode==1 and !data.containsKey('deviceSrcIncrement'))">
+                a.deviceSrc=ifnull(a.deviceSrc,0) + #{data.deviceSrcIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('lon')) or (colPickMode==1 and !data.containsKey('lon'))">
+                a.lon=#{data.lon},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('lati')) or (colPickMode==1 and !data.containsKey('lati'))">
+                a.lati=#{data.lati},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('leadingOfficial')) or (colPickMode==1 and !data.containsKey('leadingOfficial'))">
+                a.leadingOfficial=#{data.leadingOfficial},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('leadingOfficialTelephone')) or (colPickMode==1 and !data.containsKey('leadingOfficialTelephone'))">
+                a.leadingOfficialTelephone=#{data.leadingOfficialTelephone},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('deviceStatus')) or (colPickMode==1 and !data.containsKey('deviceStatus'))">
+                a.deviceStatus=#{data.deviceStatus},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('deviceStatusIncrement')) or (colPickMode==1 and !data.containsKey('deviceStatusIncrement'))">
+                a.deviceStatus=ifnull(a.deviceStatus,0) + #{data.deviceStatusIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('deviceRemark')) or (colPickMode==1 and !data.containsKey('deviceRemark'))">
+                a.deviceRemark=#{data.deviceRemark},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('source')) or (colPickMode==1 and !data.containsKey('source'))">
+                a.source=#{data.source},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('sourceIncrement')) or (colPickMode==1 and !data.containsKey('sourceIncrement'))">
+                a.source=ifnull(a.source,0) + #{data.sourceIncrement},
+            </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_device 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="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="deviceCode=(case" suffix="ELSE deviceCode end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('deviceCode')) or (colPickMode==1 and !item.containsKey('deviceCode'))">
+                            when a.id=#{item.id} then #{item.deviceCode}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="deviceMac=(case" suffix="ELSE deviceMac end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('deviceMac')) or (colPickMode==1 and !item.containsKey('deviceMac'))">
+                            when a.id=#{item.id} then #{item.deviceMac}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="siteId=(case" suffix="ELSE siteId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
+                                        when a.id=#{item.id} then #{item.siteId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="siteCode=(case" suffix="ELSE siteCode end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <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="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="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="deviceSrc=(case" suffix="ELSE deviceSrc end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('deviceSrc')) or (colPickMode==1 and !item.containsKey('deviceSrc'))">
+                                        when a.id=#{item.id} then #{item.deviceSrc}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('deviceSrcIncrement')) or (colPickMode==1 and !item.containsKey('deviceSrcIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.deviceSrc,0) + #{item.deviceSrcIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="lon=(case" suffix="ELSE lon end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('lon')) or (colPickMode==1 and !item.containsKey('lon'))">
+                            when a.id=#{item.id} then #{item.lon}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="lati=(case" suffix="ELSE lati end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('lati')) or (colPickMode==1 and !item.containsKey('lati'))">
+                            when a.id=#{item.id} then #{item.lati}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="leadingOfficial=(case" suffix="ELSE leadingOfficial end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('leadingOfficial')) or (colPickMode==1 and !item.containsKey('leadingOfficial'))">
+                            when a.id=#{item.id} then #{item.leadingOfficial}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="leadingOfficialTelephone=(case" suffix="ELSE leadingOfficialTelephone end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('leadingOfficialTelephone')) or (colPickMode==1 and !item.containsKey('leadingOfficialTelephone'))">
+                            when a.id=#{item.id} then #{item.leadingOfficialTelephone}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="deviceStatus=(case" suffix="ELSE deviceStatus end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('deviceStatus')) or (colPickMode==1 and !item.containsKey('deviceStatus'))">
+                                        when a.id=#{item.id} then #{item.deviceStatus}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('deviceStatusIncrement')) or (colPickMode==1 and !item.containsKey('deviceStatusIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.deviceStatus,0) + #{item.deviceStatusIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="deviceRemark=(case" suffix="ELSE deviceRemark end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('deviceRemark')) or (colPickMode==1 and !item.containsKey('deviceRemark'))">
+                            when a.id=#{item.id} then #{item.deviceRemark}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="source=(case" suffix="ELSE source end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('source')) or (colPickMode==1 and !item.containsKey('source'))">
+                                        when a.id=#{item.id} then #{item.source}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('sourceIncrement')) or (colPickMode==1 and !item.containsKey('sourceIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.source,0) + #{item.sourceIncrement}
+                                    </when>
+                                </choose>
+                            </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="DeviceEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_device as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_xhx_device as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_xhx_device where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_xhx_device where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_xhx_device where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_xhx_device as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="DeviceEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_device 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_device 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') and conditionParamRef.idList.size() > 0">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
+                ${_conditionType_} a.id not in
+                <foreach collection="conditionParamRef.idNotList" 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>
+                <if test="conditionParamRef.deviceId == null">
+                    ${_conditionType_} a.deviceId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceIdList') and conditionParamRef.deviceIdList.size() > 0">
+                ${_conditionType_} a.deviceId in
+                <foreach collection="conditionParamRef.deviceIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceIdNotList') and conditionParamRef.deviceIdNotList.size() > 0">
+                ${_conditionType_} a.deviceId not in
+                <foreach collection="conditionParamRef.deviceIdNotList" 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('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.containsKey('deviceNameList') and conditionParamRef.deviceNameList.size() > 0">
+                ${_conditionType_} a.deviceName in
+                <foreach collection="conditionParamRef.deviceNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceNameNotList') and conditionParamRef.deviceNameNotList.size() > 0">
+                ${_conditionType_} a.deviceName not in
+                <foreach collection="conditionParamRef.deviceNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('deviceCode')">
+                <if test="conditionParamRef.deviceCode != null and conditionParamRef.deviceCode != ''">
+                    ${_conditionType_} a.deviceCode like #{${_conditionParam_}.deviceCode}
+                </if>
+                <if test="conditionParamRef.deviceCode == null">
+                    ${_conditionType_} a.deviceCode is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceCodeList') and conditionParamRef.deviceCodeList.size() > 0">
+                ${_conditionType_} a.deviceCode in
+                <foreach collection="conditionParamRef.deviceCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceCodeNotList') and conditionParamRef.deviceCodeNotList.size() > 0">
+                ${_conditionType_} a.deviceCode not in
+                <foreach collection="conditionParamRef.deviceCodeNotList" 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}
+                </if>
+                <if test="conditionParamRef.deviceMac == null">
+                    ${_conditionType_} a.deviceMac is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceMacList') and conditionParamRef.deviceMacList.size() > 0">
+                ${_conditionType_} a.deviceMac in
+                <foreach collection="conditionParamRef.deviceMacList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceMacNotList') and conditionParamRef.deviceMacNotList.size() > 0">
+                ${_conditionType_} a.deviceMac not in
+                <foreach collection="conditionParamRef.deviceMacNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('siteId')">
+                <if test="conditionParamRef.siteId != null ">
+                    ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
+                </if>
+                <if test="conditionParamRef.siteId == null">
+                    ${_conditionType_} a.siteId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                ${_conditionType_} a.siteId in
+                <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
+                ${_conditionType_} a.siteId not in
+                <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
+                ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
+                ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('siteCode')">
+                <if test="conditionParamRef.siteCode != null and conditionParamRef.siteCode != ''">
+                    ${_conditionType_} a.siteCode like #{${_conditionParam_}.siteCode}
+                </if>
+                <if test="conditionParamRef.siteCode == null">
+                    ${_conditionType_} a.siteCode is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('siteCodeList') and conditionParamRef.siteCodeList.size() > 0">
+                ${_conditionType_} a.siteCode in
+                <foreach collection="conditionParamRef.siteCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('siteCodeNotList') and conditionParamRef.siteCodeNotList.size() > 0">
+                ${_conditionType_} a.siteCode not in
+                <foreach collection="conditionParamRef.siteCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <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('siteNameList') and conditionParamRef.siteNameList.size() > 0">
+                ${_conditionType_} a.siteName in
+                <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
+                ${_conditionType_} a.siteName not in
+                <foreach collection="conditionParamRef.siteNameNotList" 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') and conditionParamRef.productCodeList.size() > 0">
+                ${_conditionType_} a.productCode in
+                <foreach collection="conditionParamRef.productCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('productCodeNotList') and conditionParamRef.productCodeNotList.size() > 0">
+                ${_conditionType_} a.productCode not in
+                <foreach collection="conditionParamRef.productCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </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') and conditionParamRef.productNameList.size() > 0">
+                ${_conditionType_} a.productName in
+                <foreach collection="conditionParamRef.productNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('productNameNotList') and conditionParamRef.productNameNotList.size() > 0">
+                ${_conditionType_} a.productName not in
+                <foreach collection="conditionParamRef.productNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceSrc')">
+                <if test="conditionParamRef.deviceSrc != null ">
+                    ${_conditionType_} a.deviceSrc = #{${_conditionParam_}.deviceSrc}
+                </if>
+                <if test="conditionParamRef.deviceSrc == null">
+                    ${_conditionType_} a.deviceSrc is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceSrcList') and conditionParamRef.deviceSrcList.size() > 0">
+                ${_conditionType_} a.deviceSrc in
+                <foreach collection="conditionParamRef.deviceSrcList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceSrcNotList') and conditionParamRef.deviceSrcNotList.size() > 0">
+                ${_conditionType_} a.deviceSrc not in
+                <foreach collection="conditionParamRef.deviceSrcNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceSrcStart') and conditionParamRef.deviceSrcStart != null">
+                ${_conditionType_} a.deviceSrc <![CDATA[ >= ]]> #{${_conditionParam_}.deviceSrcStart}
+            </if>
+            <if test="conditionParamRef.containsKey('deviceSrcEnd') and conditionParamRef.deviceSrcEnd != null">
+                ${_conditionType_} a.deviceSrc <![CDATA[ <= ]]> #{${_conditionParam_}.deviceSrcEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('lon')">
+                <if test="conditionParamRef.lon != null and conditionParamRef.lon != ''">
+                    ${_conditionType_} a.lon like #{${_conditionParam_}.lon}
+                </if>
+                <if test="conditionParamRef.lon == null">
+                    ${_conditionType_} a.lon is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('lonList') and conditionParamRef.lonList.size() > 0">
+                ${_conditionType_} a.lon in
+                <foreach collection="conditionParamRef.lonList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('lonNotList') and conditionParamRef.lonNotList.size() > 0">
+                ${_conditionType_} a.lon not in
+                <foreach collection="conditionParamRef.lonNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('lati')">
+                <if test="conditionParamRef.lati != null and conditionParamRef.lati != ''">
+                    ${_conditionType_} a.lati like #{${_conditionParam_}.lati}
+                </if>
+                <if test="conditionParamRef.lati == null">
+                    ${_conditionType_} a.lati is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('latiList') and conditionParamRef.latiList.size() > 0">
+                ${_conditionType_} a.lati in
+                <foreach collection="conditionParamRef.latiList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('latiNotList') and conditionParamRef.latiNotList.size() > 0">
+                ${_conditionType_} a.lati not in
+                <foreach collection="conditionParamRef.latiNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('leadingOfficial')">
+                <if test="conditionParamRef.leadingOfficial != null and conditionParamRef.leadingOfficial != ''">
+                    ${_conditionType_} a.leadingOfficial like #{${_conditionParam_}.leadingOfficial}
+                </if>
+                <if test="conditionParamRef.leadingOfficial == null">
+                    ${_conditionType_} a.leadingOfficial is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('leadingOfficialList') and conditionParamRef.leadingOfficialList.size() > 0">
+                ${_conditionType_} a.leadingOfficial in
+                <foreach collection="conditionParamRef.leadingOfficialList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('leadingOfficialNotList') and conditionParamRef.leadingOfficialNotList.size() > 0">
+                ${_conditionType_} a.leadingOfficial not in
+                <foreach collection="conditionParamRef.leadingOfficialNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('leadingOfficialTelephone')">
+                <if test="conditionParamRef.leadingOfficialTelephone != null and conditionParamRef.leadingOfficialTelephone != ''">
+                    ${_conditionType_} a.leadingOfficialTelephone like #{${_conditionParam_}.leadingOfficialTelephone}
+                </if>
+                <if test="conditionParamRef.leadingOfficialTelephone == null">
+                    ${_conditionType_} a.leadingOfficialTelephone is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('leadingOfficialTelephoneList') and conditionParamRef.leadingOfficialTelephoneList.size() > 0">
+                ${_conditionType_} a.leadingOfficialTelephone in
+                <foreach collection="conditionParamRef.leadingOfficialTelephoneList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('leadingOfficialTelephoneNotList') and conditionParamRef.leadingOfficialTelephoneNotList.size() > 0">
+                ${_conditionType_} a.leadingOfficialTelephone not in
+                <foreach collection="conditionParamRef.leadingOfficialTelephoneNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceStatus')">
+                <if test="conditionParamRef.deviceStatus != null ">
+                    ${_conditionType_} a.deviceStatus = #{${_conditionParam_}.deviceStatus}
+                </if>
+                <if test="conditionParamRef.deviceStatus == null">
+                    ${_conditionType_} a.deviceStatus is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceStatusList') and conditionParamRef.deviceStatusList.size() > 0">
+                ${_conditionType_} a.deviceStatus in
+                <foreach collection="conditionParamRef.deviceStatusList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceStatusNotList') and conditionParamRef.deviceStatusNotList.size() > 0">
+                ${_conditionType_} a.deviceStatus not in
+                <foreach collection="conditionParamRef.deviceStatusNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceStatusStart') and conditionParamRef.deviceStatusStart != null">
+                ${_conditionType_} a.deviceStatus <![CDATA[ >= ]]> #{${_conditionParam_}.deviceStatusStart}
+            </if>
+            <if test="conditionParamRef.containsKey('deviceStatusEnd') and conditionParamRef.deviceStatusEnd != null">
+                ${_conditionType_} a.deviceStatus <![CDATA[ <= ]]> #{${_conditionParam_}.deviceStatusEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('deviceRemark')">
+                <if test="conditionParamRef.deviceRemark != null and conditionParamRef.deviceRemark != ''">
+                    ${_conditionType_} a.deviceRemark like #{${_conditionParam_}.deviceRemark}
+                </if>
+                <if test="conditionParamRef.deviceRemark == null">
+                    ${_conditionType_} a.deviceRemark is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceRemarkList') and conditionParamRef.deviceRemarkList.size() > 0">
+                ${_conditionType_} a.deviceRemark in
+                <foreach collection="conditionParamRef.deviceRemarkList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceRemarkNotList') and conditionParamRef.deviceRemarkNotList.size() > 0">
+                ${_conditionType_} a.deviceRemark not in
+                <foreach collection="conditionParamRef.deviceRemarkNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('source')">
+                <if test="conditionParamRef.source != null ">
+                    ${_conditionType_} a.source = #{${_conditionParam_}.source}
+                </if>
+                <if test="conditionParamRef.source == null">
+                    ${_conditionType_} a.source is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
+                ${_conditionType_} a.source in
+                <foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('sourceNotList') and conditionParamRef.sourceNotList.size() > 0">
+                ${_conditionType_} a.source not in
+                <foreach collection="conditionParamRef.sourceNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('sourceStart') and conditionParamRef.sourceStart != null">
+                ${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart}
+            </if>
+            <if test="conditionParamRef.containsKey('sourceEnd') and conditionParamRef.sourceEnd != null">
+                ${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd}
+            </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') and conditionParamRef.createUserIdList.size() > 0">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
+                ${_conditionType_} a.createUserId not in
+                <foreach collection="conditionParamRef.createUserIdNotList" 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') and conditionParamRef.updateUserIdList.size() > 0">
+                ${_conditionType_} a.updateUserId in
+                <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
+                ${_conditionType_} a.updateUserId not in
+                <foreach collection="conditionParamRef.updateUserIdNotList" 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('deviceId')">
+                        a.deviceId
+                        <if test='orderCol.deviceId != null and "DESC".equalsIgnoreCase(orderCol.deviceId)'>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('deviceCode')">
+                        a.deviceCode
+                        <if test='orderCol.deviceCode != null and "DESC".equalsIgnoreCase(orderCol.deviceCode)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('deviceMac')">
+                        a.deviceMac
+                        <if test='orderCol.deviceMac != null and "DESC".equalsIgnoreCase(orderCol.deviceMac)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('siteId')">
+                        a.siteId
+                        <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
+                        ,
+                    </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('productCode')">
+                        a.productCode
+                        <if test='orderCol.productCode != null and "DESC".equalsIgnoreCase(orderCol.productCode)'>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('deviceSrc')">
+                        a.deviceSrc
+                        <if test='orderCol.deviceSrc != null and "DESC".equalsIgnoreCase(orderCol.deviceSrc)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('lon')">
+                        a.lon
+                        <if test='orderCol.lon != null and "DESC".equalsIgnoreCase(orderCol.lon)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('lati')">
+                        a.lati
+                        <if test='orderCol.lati != null and "DESC".equalsIgnoreCase(orderCol.lati)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('leadingOfficial')">
+                        a.leadingOfficial
+                        <if test='orderCol.leadingOfficial != null and "DESC".equalsIgnoreCase(orderCol.leadingOfficial)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('leadingOfficialTelephone')">
+                        a.leadingOfficialTelephone
+                        <if test='orderCol.leadingOfficialTelephone != null and "DESC".equalsIgnoreCase(orderCol.leadingOfficialTelephone)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('deviceStatus')">
+                        a.deviceStatus
+                        <if test='orderCol.deviceStatus != null and "DESC".equalsIgnoreCase(orderCol.deviceStatus)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('deviceRemark')">
+                        a.deviceRemark
+                        <if test='orderCol.deviceRemark != null and "DESC".equalsIgnoreCase(orderCol.deviceRemark)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('source')">
+                        a.source
+                        <if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>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