增加设备模块表

certificate-manager/doc/api.md

@@ -1207,6 +1207,232 @@ msg|String|消息|-
 }
 
 ```
+
+### 查询证照柜设备模块列表
+
+**请求URL:** device/module/list
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查询证照柜设备模块
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+page|Integer|否|当前页
+size|Integer|否|每页条数，值为-1，查询所有记录
+
+**请求样例:**
+```
+  {
+        "page":1,
+        "size":10
+  }
+
+```
+**响应参数:**
+
+参数名称|参数类型|描述
+:---|:---|:------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+ per_page|Integer|每页条数
+ total|Integer|总条数
+ last_page|Integer|总页数
+ current_page|Integer|当前页
+ data|array|结果集列表|数组
+  id|Long|序号，主键，自增长
+  deviceId|Long|设备Id
+  deviceName|String|设备名称
+  moduleName|String|模块名称
+  productName|String|产品名称
+  networkAddress|String|网络地址
+  cartonType|String|纸盒
+  createUserId|Long|创建用户
+  createTime|Date|创建时间
+  updateUserId|Long|更新用户
+  updateTime|Date|更新时间
+dict|object|字典对象
+
+**响应消息样例:**
+```
+{
+    "code":1,
+    "data":{
+    }
+}
+```
+
+### 查看证照柜设备模块
+
+**请求URL:** device/module/info
+
+**请求方式:** GET
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查看证照柜设备模块，返回实例详细信息
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+id|Long|是|ID
+
+**请求样例:**
+```
+    http://localhost/device/module/info?id=549
+```
+**响应参数:**
+
+参数名称 |参数类型|描述
+:---|:---|:-------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+ id|Long|序号，主键，自增长
+ deviceId|Long|设备Id
+ deviceName|String|设备名称
+ moduleName|String|模块名称
+ productName|String|产品名称
+ networkAddress|String|网络地址
+ cartonType|String|纸盒
+ createUserId|Long|创建用户
+ createTime|Date|创建时间
+ updateUserId|Long|更新用户
+ updateTime|Date|更新时间
+dict|object|字典对象
+
+**响应消息样例:**
+```
+{
+    "code": 1,
+    "data": {
+            "id":1223,
+            "deviceId":9452,
+            "deviceName":"2p4d5m",
+            "moduleName":"natbvq",
+            "productName":"7h9dq2",
+            "networkAddress":"s2a58c",
+            "cartonType":"h35dsu",
+            "createUserId":8676,
+            "createTime":"2022-10-26",
+            "updateUserId":845,
+            "updateTime":"2022-10-26"
+        }
+}
+```
+
+### 保存更新证照柜设备模块
+
+**请求URL:** device/module/save
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 保存或更新证照柜设备模块：id为空时为新增保存，否则为更新提交
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:-------
+id|Long|否|序号，主键，自增长
+deviceName|String|是|设备名称
+moduleName|String|是|模块名称
+productName|String|是|产品名称
+networkAddress|String|是|网络地址
+cartonType|String|是|纸盒
+createUserId|Long|否|创建用户
+createTime|Date|否|创建时间
+updateUserId|Long|否|更新用户
+updateTime|Date|否|更新时间
+
+**请求样例:**
+```
+{
+    "deviceId":4045,
+    "deviceName":"9bqrsn",
+    "moduleName":"awiz1g",
+    "productName":"xub2jg",
+    "networkAddress":"bhkrd2",
+    "cartonType":"6f0co4",
+}
+
+```
+**响应参数:**
+
+参数名称 |参数类型|描述
+:---|:---|:------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+ id|Long|保存后主键id
+ entity|object|保存更新实体
+  id|Long|序号，主键，自增长
+  deviceId|Long|设备Id
+  deviceName|String|设备名称
+  moduleName|String|模块名称
+  productName|String|产品名称
+  networkAddress|String|网络地址
+  cartonType|String|纸盒
+  createUserId|Long|创建用户
+  createTime|Date|创建时间
+  updateUserId|Long|更新用户
+  updateTime|Date|更新时间
+
+**响应消息样例:**
+```
+{
+    "msg":"新增模块成功",
+    "code":1,
+    "data":{}
+    }
+}
+
+```
+
+### 删除证照柜设备模块
+
+**请求URL:** device/module/delete
+
+**请求方式:** GET
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 删除证照柜设备模块
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+id|String|是|数组
+
+**请求样例:**
+```
+    http://localhost:8080/device/module/delete?id=1&id=2'
+```
+**响应参数:**
+
+参数名称 |参数类型|备注|其它
+---|---|---|---
+code|Integer|结果码（-1.失败，1.成功）|-
+msg|String|消息|-
+
+**响应消息样例:**
+```
+{
+    "code":1,
+	"msg":"成功"
+}
+
+```
+
+
 ## 证照申请
 
 ### 查询证照申请列表

certificate-manager/src/main/java/com/mortals/xhx/common/code/CartonType.java

+package com.mortals.xhx.common.code;
+
+import com.mortals.framework.ap.SysConstains;
+import com.mortals.framework.common.IBaseEnum;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * 纸盒类型
+ */
+public enum CartonType implements IBaseEnum {
+
+    A1(1, "A1", SysConstains.STYLE_DEFAULT),
+    A2(2, "A2", SysConstains.STYLE_DEFAULT),
+    A3(3, "A3", SysConstains.STYLE_DEFAULT),
+    A4(4, "A4", SysConstains.STYLE_DEFAULT),
+    A5(5, "A5", SysConstains.STYLE_DEFAULT);
+
+    private int value;
+    private String desc;
+    private String style;
+
+    CartonType(int value, String desc, String style) {
+        this.value = value;
+        this.desc = desc;
+        this.style = style;
+    }
+
+    @Override
+    public int getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public String getStyle()
+    {
+        return style;
+    }
+
+    public static CartonType getByValue(int value) {
+        for (CartonType e : CartonType.values()) {
+            if (e.getValue() == value) {
+                return e;
+            }
+        }
+        return null;
+    }
+
+    public static Map<String,String> getEnumMap(int... eItem) {
+        Map<String,String> resultMap= new LinkedHashMap<String,String>();
+        for (CartonType item : CartonType.values()) {
+            try{
+                boolean hasE = false;
+                for (int e : eItem){
+                    if(item.getValue()==e){
+                        hasE = true;
+                        break;
+                    }
+                }
+                if(!hasE){
+                    resultMap.put(item.getValue()+"", item.getDesc());
+                }
+            }catch(Exception ex){
+            }
+        }
+        return resultMap;
+    }
+
+}
\ No newline at end of file

certificate-manager/src/main/java/com/mortals/xhx/common/code/ResolutionEnum.java

@@ -45,19 +45,19 @@ public enum ResolutionEnum {
         return null;
     }
 
-    public static Map<String,String> getEnumMap(int... eItem) {
+    public static Map<String,String> getEnumMap(String... eItem) {
         Map<String,String> resultMap= new LinkedHashMap<String,String>();
         for (ResolutionEnum item : ResolutionEnum.values()) {
             try{
                 boolean hasE = false;
-                for (int e : eItem){
+                for (String e : eItem){
                     if(item.getValue().equals(e)){
                         hasE = true;
                         break;
                     }
                 }
                 if(!hasE){
-                    resultMap.put(item.getValue()+"", item.getDesc());
+                    resultMap.put(item.getValue(), item.getDesc());
                 }
             }catch(Exception ex){
             }

certificate-manager/src/main/java/com/mortals/xhx/module/device/dao/DeviceModuleDao.java

+package com.mortals.xhx.module.device.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.device.model.DeviceModuleEntity;
+import java.util.List;
+/**
+* 证照柜设备Dao
+* 证照柜设备 DAO接口
+*
+* @author zxfei
+* @date 2022-10-26
+*/
+public interface  DeviceModuleDao extends ICRUDDao<DeviceModuleEntity,Long>{
+
+
+}

certificate-manager/src/main/java/com/mortals/xhx/module/device/dao/ibatis/DeviceModuleDaoImpl.java

+package com.mortals.xhx.module.device.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.device.dao.DeviceModuleDao;
+import com.mortals.xhx.module.device.model.DeviceModuleEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 证照柜设备DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-10-26
+*/
+@Repository("deviceModuleDao")
+public class DeviceModuleDaoImpl extends BaseCRUDDaoMybatis<DeviceModuleEntity,Long> implements DeviceModuleDao {
+
+
+
+}

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

+package com.mortals.xhx.module.device.model;
+
+import java.util.List;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.device.model.vo.DeviceModuleVo;
+/**
+* 证照柜设备实体对象
+*
+* @author zxfei
+* @date 2022-10-26
+*/
+
+public class DeviceModuleEntity extends DeviceModuleVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 设备Id
+    */
+    private Long deviceId;
+    /**
+    * 设备名称
+    */
+    private String deviceName;
+    /**
+    * 模块名称
+    */
+    private String moduleName;
+    /**
+    * 产品名称
+    */
+    private String productName;
+    /**
+    * 网络地址
+    */
+    private String networkAddress;
+    /**
+    * 纸盒
+    */
+    private String cartonType;
+
+
+
+    public DeviceModuleEntity(){}
+    /**
+    * 获取 设备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 getModuleName(){
+        return moduleName;
+    }
+    /**
+    * 设置 模块名称
+    * @param moduleName
+    */
+    public void setModuleName(String moduleName){
+        this.moduleName = moduleName;
+    }
+    /**
+    * 获取 产品名称
+    * @return String
+    */
+    public String getProductName(){
+        return productName;
+    }
+    /**
+    * 设置 产品名称
+    * @param productName
+    */
+    public void setProductName(String productName){
+        this.productName = productName;
+    }
+    /**
+    * 获取 网络地址
+    * @return String
+    */
+    public String getNetworkAddress(){
+        return networkAddress;
+    }
+    /**
+    * 设置 网络地址
+    * @param networkAddress
+    */
+    public void setNetworkAddress(String networkAddress){
+        this.networkAddress = networkAddress;
+    }
+    /**
+    * 获取 纸盒
+    * @return String
+    */
+    public String getCartonType(){
+        return cartonType;
+    }
+    /**
+    * 设置 纸盒
+    * @param cartonType
+    */
+    public void setCartonType(String cartonType){
+        this.cartonType = cartonType;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof DeviceModuleEntity) {
+            DeviceModuleEntity tmp = (DeviceModuleEntity) 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(",moduleName:").append(getModuleName());
+        sb.append(",productName:").append(getProductName());
+        sb.append(",networkAddress:").append(getNetworkAddress());
+        sb.append(",cartonType:").append(getCartonType());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.deviceId = null;
+
+            this.deviceName = "";
+
+            this.moduleName = "";
+
+            this.productName = "";
+
+            this.networkAddress = "";
+
+            this.cartonType = "";
+    }
+}
\ No newline at end of file

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

+package com.mortals.xhx.module.device.model;
+
+import java.util.List;
+import com.mortals.xhx.module.device.model.DeviceModuleEntity;
+/**
+* 证照柜设备查询对象
+*
+* @author zxfei
+* @date 2022-10-26
+*/
+public class DeviceModuleQuery extends DeviceModuleEntity {
+    /** 开始 序号，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 序号，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 序号，主键，自增长 */
+    private Long idIncrement;
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 开始 设备Id */
+    private Long deviceIdStart;
+
+    /** 结束 设备Id */
+    private Long deviceIdEnd;
+
+    /** 增加 设备Id */
+    private Long deviceIdIncrement;
+
+    /** 设备Id列表 */
+    private List <Long> deviceIdList;
+
+    /** 设备名称 */
+    private List<String> deviceNameList;
+
+    /** 模块名称 */
+    private List<String> moduleNameList;
+
+    /** 产品名称 */
+    private List<String> productNameList;
+
+    /** 网络地址 */
+    private List<String> networkAddressList;
+
+    /** 纸盒 */
+    private List<String> cartonTypeList;
+
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 更新用户 */
+    private Long updateUserIdStart;
+
+    /** 结束 更新用户 */
+    private Long updateUserIdEnd;
+
+    /** 增加 更新用户 */
+    private Long updateUserIdIncrement;
+
+    /** 更新用户列表 */
+    private List <Long> updateUserIdList;
+
+    /** 开始 更新时间 */
+    private String updateTimeStart;
+
+    /** 结束 更新时间 */
+    private String updateTimeEnd;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<DeviceModuleQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<DeviceModuleQuery> andConditionList;
+
+    public DeviceModuleQuery(){}
+
+    /**
+    * 获取 开始 序号，主键，自增长
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 序号，主键，自增长
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 序号，主键，自增长
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 序号，主键，自增长
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 开始 设备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;
+    }
+
+    /**
+    * 获取 设备名称
+    * @return deviceNameList
+    */
+    public List<String> getDeviceNameList(){
+        return this.deviceNameList;
+    }
+
+    /**
+    * 设置 设备名称
+    * @param deviceNameList
+    */
+    public void setDeviceNameList(List<String> deviceNameList){
+        this.deviceNameList = deviceNameList;
+    }
+    /**
+    * 获取 模块名称
+    * @return moduleNameList
+    */
+    public List<String> getModuleNameList(){
+        return this.moduleNameList;
+    }
+
+    /**
+    * 设置 模块名称
+    * @param moduleNameList
+    */
+    public void setModuleNameList(List<String> moduleNameList){
+        this.moduleNameList = moduleNameList;
+    }
+    /**
+    * 获取 产品名称
+    * @return productNameList
+    */
+    public List<String> getProductNameList(){
+        return this.productNameList;
+    }
+
+    /**
+    * 设置 产品名称
+    * @param productNameList
+    */
+    public void setProductNameList(List<String> productNameList){
+        this.productNameList = productNameList;
+    }
+    /**
+    * 获取 网络地址
+    * @return networkAddressList
+    */
+    public List<String> getNetworkAddressList(){
+        return this.networkAddressList;
+    }
+
+    /**
+    * 设置 网络地址
+    * @param networkAddressList
+    */
+    public void setNetworkAddressList(List<String> networkAddressList){
+        this.networkAddressList = networkAddressList;
+    }
+    /**
+    * 获取 纸盒
+    * @return cartonTypeList
+    */
+    public List<String> getCartonTypeList(){
+        return this.cartonTypeList;
+    }
+
+    /**
+    * 设置 纸盒
+    * @param cartonTypeList
+    */
+    public void setCartonTypeList(List<String> cartonTypeList){
+        this.cartonTypeList = cartonTypeList;
+    }
+    /**
+    * 获取 开始 创建用户
+    * @return createUserIdStart
+    */
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
+    }
+
+    /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+    }
+
+    /**
+    * 获取 结束 创建用户
+    * @return $createUserIdEnd
+    */
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 创建用户
+    * @return createUserIdIncrement
+    */
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdList
+    */
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+    }
+
+    /**
+    * 获取 开始 创建时间
+    * @return createTimeStart
+    */
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
+    }
+
+    /**
+    * 设置 开始 创建时间
+    * @param createTimeStart
+    */
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
+    }
+
+    /**
+    * 获取 结束 创建时间
+    * @return createTimeEnd
+    */
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
+    }
+
+    /**
+    * 设置 结束 创建时间
+    * @param createTimeEnd
+    */
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    /**
+    * 获取 开始 更新用户
+    * @return updateUserIdStart
+    */
+    public Long getUpdateUserIdStart(){
+        return this.updateUserIdStart;
+    }
+
+    /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public void setUpdateUserIdStart(Long updateUserIdStart){
+        this.updateUserIdStart = updateUserIdStart;
+    }
+
+    /**
+    * 获取 结束 更新用户
+    * @return $updateUserIdEnd
+    */
+    public Long getUpdateUserIdEnd(){
+        return this.updateUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public void setUpdateUserIdEnd(Long updateUserIdEnd){
+        this.updateUserIdEnd = updateUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 更新用户
+    * @return updateUserIdIncrement
+    */
+    public Long getUpdateUserIdIncrement(){
+        return this.updateUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
+        this.updateUserIdIncrement = updateUserIdIncrement;
+    }
+
+    /**
+    * 获取 更新用户
+    * @return updateUserIdList
+    */
+    public List<Long> getUpdateUserIdList(){
+        return this.updateUserIdList;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public void setUpdateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+    }
+
+    /**
+    * 获取 开始 更新时间
+    * @return updateTimeStart
+    */
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
+    }
+
+    /**
+    * 设置 开始 更新时间
+    * @param updateTimeStart
+    */
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
+    }
+
+    /**
+    * 获取 结束 更新时间
+    * @return updateTimeEnd
+    */
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
+    }
+
+    /**
+    * 设置 结束 更新时间
+    * @param updateTimeEnd
+    */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
+
+    /**
+    * 设置  序号，主键，自增长
+    * @param id
+    */
+    public DeviceModuleQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public DeviceModuleQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public DeviceModuleQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public DeviceModuleQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public DeviceModuleQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+    /**
+    * 设置  设备Id
+    * @param deviceId
+    */
+    public DeviceModuleQuery deviceId(Long deviceId){
+	    setDeviceId(deviceId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 设备Id
+    * @param deviceIdStart
+    */
+    public DeviceModuleQuery deviceIdStart(Long deviceIdStart){
+		this.deviceIdStart = deviceIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 设备Id
+    * @param deviceIdEnd
+    */
+    public DeviceModuleQuery deviceIdEnd(Long deviceIdEnd){
+		this.deviceIdEnd = deviceIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 设备Id
+    * @param deviceIdIncrement
+    */
+    public DeviceModuleQuery deviceIdIncrement(Long deviceIdIncrement){
+		this.deviceIdIncrement = deviceIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 设备Id
+    * @param deviceIdList
+    */
+    public DeviceModuleQuery deviceIdList(List<Long> deviceIdList){
+        this.deviceIdList = deviceIdList;
+		return this;
+        }
+
+
+	/**
+    * 设置 设备名称
+    * @param deviceName
+    */
+    public DeviceModuleQuery deviceName(String deviceName){
+        setDeviceName(deviceName);
+		return this;
+    }
+
+    /**
+    * 设置 设备名称
+    * @param deviceNameList
+    */
+    public DeviceModuleQuery deviceNameList(List<String> deviceNameList){
+        this.deviceNameList = deviceNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 模块名称
+    * @param moduleName
+    */
+    public DeviceModuleQuery moduleName(String moduleName){
+        setModuleName(moduleName);
+		return this;
+    }
+
+    /**
+    * 设置 模块名称
+    * @param moduleNameList
+    */
+    public DeviceModuleQuery moduleNameList(List<String> moduleNameList){
+        this.moduleNameList = moduleNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 产品名称
+    * @param productName
+    */
+    public DeviceModuleQuery productName(String productName){
+        setProductName(productName);
+		return this;
+    }
+
+    /**
+    * 设置 产品名称
+    * @param productNameList
+    */
+    public DeviceModuleQuery productNameList(List<String> productNameList){
+        this.productNameList = productNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 网络地址
+    * @param networkAddress
+    */
+    public DeviceModuleQuery networkAddress(String networkAddress){
+        setNetworkAddress(networkAddress);
+		return this;
+    }
+
+    /**
+    * 设置 网络地址
+    * @param networkAddressList
+    */
+    public DeviceModuleQuery networkAddressList(List<String> networkAddressList){
+        this.networkAddressList = networkAddressList;
+		return this;
+    }
+
+
+	/**
+    * 设置 纸盒
+    * @param cartonType
+    */
+    public DeviceModuleQuery cartonType(String cartonType){
+        setCartonType(cartonType);
+		return this;
+    }
+
+    /**
+    * 设置 纸盒
+    * @param cartonTypeList
+    */
+    public DeviceModuleQuery cartonTypeList(List<String> cartonTypeList){
+        this.cartonTypeList = cartonTypeList;
+		return this;
+    }
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public DeviceModuleQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public DeviceModuleQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public DeviceModuleQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public DeviceModuleQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public DeviceModuleQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+
+    /**
+    * 设置  更新用户
+    * @param updateUserId
+    */
+    public DeviceModuleQuery updateUserId(Long updateUserId){
+	    setUpdateUserId(updateUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public DeviceModuleQuery updateUserIdStart(Long updateUserIdStart){
+		this.updateUserIdStart = updateUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public DeviceModuleQuery updateUserIdEnd(Long updateUserIdEnd){
+		this.updateUserIdEnd = updateUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public DeviceModuleQuery updateUserIdIncrement(Long updateUserIdIncrement){
+		this.updateUserIdIncrement = updateUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public DeviceModuleQuery updateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+		return this;
+        }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<DeviceModuleQuery> 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<DeviceModuleQuery> 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<DeviceModuleQuery> 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<DeviceModuleQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

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

+package com.mortals.xhx.module.device.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.device.model.DeviceModuleEntity;
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 证照柜设备视图对象
+*
+* @author zxfei
+* @date 2022-10-26
+*/
+public class DeviceModuleVo extends BaseEntityLong {
+
+}
\ No newline at end of file

certificate-manager/src/main/java/com/mortals/xhx/module/device/service/DeviceModuleService.java

+package com.mortals.xhx.module.device.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.device.model.DeviceModuleEntity;
+/**
+* DeviceModuleService
+*
+* 证照柜设备 service接口
+*
+* @author zxfei
+* @date 2022-10-26
+*/
+public interface DeviceModuleService extends ICRUDService<DeviceModuleEntity,Long>{
+
+}
\ No newline at end of file

certificate-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceModuleServiceImpl.java

+package com.mortals.xhx.module.device.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.device.dao.DeviceModuleDao;
+import com.mortals.xhx.module.device.model.DeviceModuleEntity;
+import com.mortals.xhx.module.device.service.DeviceModuleService;
+/**
+* DeviceModuleService
+* 证照柜设备 service实现
+*
+* @author zxfei
+* @date 2022-10-26
+*/
+@Service("deviceModuleService")
+public class DeviceModuleServiceImpl extends AbstractCRUDServiceImpl<DeviceModuleDao, DeviceModuleEntity, Long> implements DeviceModuleService {
+    
+}
\ No newline at end of file

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

 package com.mortals.xhx.module.device.web;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.ResolutionEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -46,7 +47,7 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
         this.addDict(model, "building", paramService.getParamBySecondOrganize("Device","building"));
         this.addDict(model, "floor", paramService.getParamBySecondOrganize("Device","floor"));
         this.addDict(model, "status", paramService.getParamBySecondOrganize("Device","status"));
-        this.addDict(model, "enabled", paramService.getParamBySecondOrganize("Device","enabled"));
+        this.addDict(model, "resolution", ResolutionEnum.getEnumMap());
         super.init(model, context);
     }
 

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

+package com.mortals.xhx.module.device.web;
+import com.mortals.framework.common.IBaseEnum;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.CartonType;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.device.model.DeviceModuleEntity;
+import com.mortals.xhx.module.device.service.DeviceModuleService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+/**
+*
+* 证照柜设备
+*
+* @author zxfei
+* @date 2022-10-26
+*/
+@RestController
+@RequestMapping("device/module")
+public class DeviceModuleController extends BaseCRUDJsonBodyMappingController<DeviceModuleService,DeviceModuleEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public DeviceModuleController(){
+        super.setModuleDesc( "证照柜设备模块");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "cartonType",IBaseEnum.getEnumMap(CartonType.class));
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

certificate-manager/src/main/resources/sqlmap/module/device/DeviceModuleMapper.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.DeviceModuleDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="DeviceModuleEntity" id="DeviceModuleEntity-Map">
+            <id  property="id" column="id" />
+            <result property="deviceId" column="deviceId" />
+            <result property="deviceName" column="deviceName" />
+            <result property="moduleName" column="moduleName" />
+            <result property="productName" column="productName" />
+            <result property="networkAddress" column="networkAddress" />
+            <result property="cartonType" column="cartonType" />
+            <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('moduleName') or colPickMode == 1 and data.containsKey('moduleName')))">
+                    a.moduleName,
+                </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('networkAddress') or colPickMode == 1 and data.containsKey('networkAddress')))">
+                    a.networkAddress,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('cartonType') or colPickMode == 1 and data.containsKey('cartonType')))">
+                    a.cartonType,
+                </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="DeviceModuleEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_device_module
+        (deviceId,deviceName,moduleName,productName,networkAddress,cartonType,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        (#{deviceId},#{deviceName},#{moduleName},#{productName},#{networkAddress},#{cartonType},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_xhx_device_module
+        (deviceId,deviceName,moduleName,productName,networkAddress,cartonType,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.deviceId},#{item.deviceName},#{item.moduleName},#{item.productName},#{item.networkAddress},#{item.cartonType},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_xhx_device_module 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('moduleName')) or (colPickMode==1 and !data.containsKey('moduleName'))">
+                a.moduleName=#{data.moduleName},
+            </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('networkAddress')) or (colPickMode==1 and !data.containsKey('networkAddress'))">
+                a.networkAddress=#{data.networkAddress},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('cartonType')) or (colPickMode==1 and !data.containsKey('cartonType'))">
+                a.cartonType=#{data.cartonType},
+            </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_module 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="moduleName=(case" suffix="ELSE moduleName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('moduleName')) or (colPickMode==1 and !item.containsKey('moduleName'))">
+                            when a.id=#{item.id} then #{item.moduleName}
+                        </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="networkAddress=(case" suffix="ELSE networkAddress end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('networkAddress')) or (colPickMode==1 and !item.containsKey('networkAddress'))">
+                            when a.id=#{item.id} then #{item.networkAddress}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="cartonType=(case" suffix="ELSE cartonType end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('cartonType')) or (colPickMode==1 and !item.containsKey('cartonType'))">
+                            when a.id=#{item.id} then #{item.cartonType}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                                        when a.id=#{item.id} then #{item.createUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                            when a.id=#{item.id} then #{item.createTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
+                                        when a.id=#{item.id} then #{item.updateUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                            when a.id=#{item.id} then #{item.updateTime}
+                        </if>
+                    </foreach>
+                </trim>
+        </trim>
+        where id in
+        <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="DeviceModuleEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_device_module as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_xhx_device_module as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_xhx_device_module where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_xhx_device_module as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="DeviceModuleEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_device_module 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_module as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+    <!-- 条件映射 -->
+    <sql id="_condition_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+            <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
+            <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
+                and
+                <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
+                    <trim prefixOverrides="or" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="andCondition"/>
+                            <property name="_conditionType_" value="or"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+            <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
+            <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
+                and
+                <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
+                    <trim prefixOverrides="and" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="orCondition"/>
+                            <property name="_conditionType_" value="and"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+        </if>
+    </sql>
+    <!-- 条件映射-代参数 -->
+    <sql id="_condition_param_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null">
+                ${_conditionType_} a.id=#{${_conditionParam_}.id}
+            </if>
+        </if>
+            <if test="conditionParamRef.containsKey('id')">
+                <if test="conditionParamRef.id != null ">
+                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
+                </if>
+                <if test="conditionParamRef.id == null">
+                    ${_conditionType_} a.id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('idList')">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+                ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+            </if>
+            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('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')">
+                ${_conditionType_} a.deviceId in
+                <foreach collection="conditionParamRef.deviceIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceIdStart') and conditionParamRef.deviceIdStart != null">
+                ${_conditionType_} a.deviceId <![CDATA[ >= ]]> #{${_conditionParam_}.deviceIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('deviceIdEnd') and conditionParamRef.deviceIdEnd != null">
+                ${_conditionType_} a.deviceId <![CDATA[ <= ]]> #{${_conditionParam_}.deviceIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('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')">
+                ${_conditionType_} a.deviceName in
+                <foreach collection="conditionParamRef.deviceNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('moduleName')">
+                <if test="conditionParamRef.moduleName != null and conditionParamRef.moduleName != ''">
+                    ${_conditionType_} a.moduleName like #{${_conditionParam_}.moduleName}
+                </if>
+                <if test="conditionParamRef.moduleName == null">
+                    ${_conditionType_} a.moduleName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('moduleNameList')">
+                ${_conditionType_} a.moduleName in
+                <foreach collection="conditionParamRef.moduleNameList" 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')">
+                ${_conditionType_} a.productName in
+                <foreach collection="conditionParamRef.productNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('networkAddress')">
+                <if test="conditionParamRef.networkAddress != null and conditionParamRef.networkAddress != ''">
+                    ${_conditionType_} a.networkAddress like #{${_conditionParam_}.networkAddress}
+                </if>
+                <if test="conditionParamRef.networkAddress == null">
+                    ${_conditionType_} a.networkAddress is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('networkAddressList')">
+                ${_conditionType_} a.networkAddress in
+                <foreach collection="conditionParamRef.networkAddressList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('cartonType')">
+                <if test="conditionParamRef.cartonType != null and conditionParamRef.cartonType != ''">
+                    ${_conditionType_} a.cartonType like #{${_conditionParam_}.cartonType}
+                </if>
+                <if test="conditionParamRef.cartonType == null">
+                    ${_conditionType_} a.cartonType is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('cartonTypeList')">
+                ${_conditionType_} a.cartonType in
+                <foreach collection="conditionParamRef.cartonTypeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserId')">
+                <if test="conditionParamRef.createUserId != null ">
+                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+                </if>
+                <if test="conditionParamRef.createUserId == null">
+                    ${_conditionType_} a.createUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList')">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+                ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.createTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserId')">
+                <if test="conditionParamRef.updateUserId != null ">
+                    ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
+                </if>
+                <if test="conditionParamRef.updateUserId == null">
+                    ${_conditionType_} a.updateUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdList')">
+                ${_conditionType_} a.updateUserId in
+                <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.updateTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+    </sql>
+    <sql id="_orderCols_">
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                     ${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                    <if test="orderCol.containsKey('id')">
+                        a.id
+                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('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('moduleName')">
+                        a.moduleName
+                        <if test='orderCol.moduleName != null and "DESC".equalsIgnoreCase(orderCol.moduleName)'>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('networkAddress')">
+                        a.networkAddress
+                        <if test='orderCol.networkAddress != null and "DESC".equalsIgnoreCase(orderCol.networkAddress)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('cartonType')">
+                        a.cartonType
+                        <if test='orderCol.cartonType != null and "DESC".equalsIgnoreCase(orderCol.cartonType)'>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