Skip to content

D
device-new-platform
Commit 84e02b55 authored by 赵啸非's avatar 赵啸非
Browse files
Options

物联网1.0

parent 4f37832b
Hide whitespace changes
Inline Side-by-side
Showing with 1920 additions and 1735 deletions
db/module.sql
View file @ 84e02b55
...@@ -129,9 +129,9 @@ PRIMARY KEY (`id`) ...@@ -129,9 +129,9 @@ PRIMARY KEY (`id`)
DROP TABLE IF EXISTS `mortals_xhx_device_module`; DROP TABLE IF EXISTS `mortals_xhx_device_module`;
CREATE TABLE mortals_xhx_device_module( CREATE TABLE mortals_xhx_device_module(
`id` bigint(20) AUTO_INCREMENT COMMENT '主键ID，主键，自增长', `id` bigint(20) AUTO_INCREMENT COMMENT '主键ID，主键，自增长',
`moduleId` bigint(20) NOT NULL COMMENT '模块名称', `moduleName` varchar(256) NOT NULL COMMENT '模块名称',
`deviceId` bigint(20) NOT NULL COMMENT '所属设备', `moduleMsgCode` varchar(256) NOT NULL COMMENT '模块消息编码，与上报消息头编码一致，唯一',
`createTime` datetime NOT NULL COMMENT '创建时间', `createTime` datetime COMMENT '创建时间',
`updateUserId` bigint(20) COMMENT '更新用户', `updateUserId` bigint(20) COMMENT '更新用户',
`updateTime` datetime COMMENT '更新时间', `updateTime` datetime COMMENT '更新时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
...@@ -143,14 +143,18 @@ PRIMARY KEY (`id`) ...@@ -143,14 +143,18 @@ PRIMARY KEY (`id`)
DROP TABLE IF EXISTS `mortals_xhx_device_module_use`; DROP TABLE IF EXISTS `mortals_xhx_device_module_use`;
CREATE TABLE mortals_xhx_device_module_use( CREATE TABLE mortals_xhx_device_module_use(
`id` bigint(20) AUTO_INCREMENT COMMENT '主键ID，主键，自增长', `id` bigint(20) AUTO_INCREMENT COMMENT '主键ID，主键，自增长',
`moduleId` bigint(20) NOT NULL COMMENT '模块ID', `moduleName` varchar(256) NOT NULL COMMENT '模块名称',
`moduleMsgCode` varchar(256) NOT NULL COMMENT '模块消息编码',
`deviceId` bigint(20) NOT NULL COMMENT '所属设备',
`useNum` int COMMENT '调用次数', `useNum` int COMMENT '调用次数',
`createTime` datetime NOT NULL COMMENT '创建时间', `createTime` datetime COMMENT '创建时间',
`updateUserId` bigint(20) COMMENT '更新用户', `updateUserId` bigint(20) COMMENT '更新用户',
`updateTime` datetime COMMENT '更新时间', `updateTime` datetime COMMENT '更新时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备模块使用频率'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备模块使用频率';
-- ---------------------------- -- ----------------------------
-- 设备告警配置表 -- 设备告警配置表
-- ---------------------------- -- ----------------------------
...@@ -193,9 +197,10 @@ CREATE TABLE mortals_xhx_device_log( ...@@ -193,9 +197,10 @@ CREATE TABLE mortals_xhx_device_log(
`id` bigint(20) AUTO_INCREMENT COMMENT '主键ID，主键，自增长', `id` bigint(20) AUTO_INCREMENT COMMENT '主键ID，主键，自增长',
`traceID` varchar(64) COMMENT 'traceId,日志追踪id', `traceID` varchar(64) COMMENT 'traceId,日志追踪id',
`deviceId` bigint(20) COMMENT '设备ID', `deviceId` bigint(20) COMMENT '设备ID',
`deviceNum` varchar(32) NOT NULL COMMENT '设备编号', `deviceCode` varchar(32) NOT NULL COMMENT '设备编号',
`deviceName` varchar(32) NOT NULL COMMENT '设备名称，设置设备名称。', `deviceName` varchar(32) NOT NULL COMMENT '设备名称，设置设备名称。',
`logType` tinyint(2) NOT NULL COMMENT '日志类型，(0.上报事件，1.下发服务)', `messageHead` varchar(64) NOT NULL COMMENT '业务消息头标识',
`logType` tinyint(2) NOT NULL COMMENT '消息类型，(0.上行，1.下行)',
`content` varchar(2048) COMMENT '内容', `content` varchar(2048) COMMENT '内容',
`createUserId` bigint(20) NOT NULL COMMENT '创建用户', `createUserId` bigint(20) NOT NULL COMMENT '创建用户',
`createTime` datetime NOT NULL COMMENT '创建时间', `createTime` datetime NOT NULL COMMENT '创建时间',
...@@ -204,6 +209,8 @@ CREATE TABLE mortals_xhx_device_log( ...@@ -204,6 +209,8 @@ CREATE TABLE mortals_xhx_device_log(
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备日志'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备日志';
-- ---------------------------- -- ----------------------------
-- 站点统计表 -- 站点统计表
-- ---------------------------- -- ----------------------------
......
device-manager-ui/admin/src/components/SearchForm.vue
View file @ 84e02b55
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
v-if="item.type === 'datetime'" v-if="item.type === 'datetime'"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间" :placeholder="item.label"
> >
</el-date-picker> </el-date-picker>
......
device-manager-ui/admin/src/views/device/alarm/info/list.vue
View file @ 84e02b55
<template> <template>
<div class="page"> <div class="page">
<LayoutTable :data="tableData" notAdd :config="tableConfig"> </LayoutTable> <LayoutTable :data="tableData" notAdd notDel :config="tableConfig"> </LayoutTable>
<dialog-show ref="dialogform" @ok="getData" /> <dialog-show ref="dialogform" @ok="getData" />
</div> </div>
...@@ -26,6 +26,7 @@ export default { ...@@ -26,6 +26,7 @@ export default {
//this.config.addQuery = { deviceId, deviceType }; //this.config.addQuery = { deviceId, deviceType };
if (this.queryIn.alarmDevice) { if (this.queryIn.alarmDevice) {
this.query={}
this.query["alarmDevice"] = this.queryIn.alarmDevice; this.query["alarmDevice"] = this.queryIn.alarmDevice;
} }
...@@ -60,21 +61,29 @@ export default { ...@@ -60,21 +61,29 @@ export default {
return { return {
config: { config: {
search: [ search: [
{
name: "alarmDevice",
type: "text",
label: "告警设备",
fuzzy: true,
},
{ {
name: "alarmStatus", name: "alarmStatus",
type: "select", type: "select",
label: "告警状态,来自工单系统", label: "告警状态",
fuzzy: true, },
{
name: "alarmTimeStart",
type: "datetime",
label: "开始时间",
},
{
name: "alarmTimeEnd",
type: "datetime",
label: "结束时间",
placeholder:"结束时间"
}, },
], ],
columns: [ columns: [
{ type: "selection", width: 60 },
{ {
label: "告警时间", label: "告警时间",
...@@ -87,33 +96,24 @@ export default { ...@@ -87,33 +96,24 @@ export default {
prop: "alarmDevice", prop: "alarmDevice",
formatter: this.formatterString, formatter: this.formatterString,
}, },
{
{ label: "告警类型,", prop: "alarmType", formatter: this.formatter }, label: "告警内容",
prop: "alarmContent",
},
{ label: "告警级别", prop: "alarmLevel", formatter: this.formatter }, { label: "告警级别", prop: "alarmLevel", formatter: this.formatter },
{ label: "接收人员,", prop: "alarmReceivePersonnel" },
{ {
label: "告警状态,来自工单系统", label: "告警状态",
prop: "alarmStatus", prop: "alarmStatus",
formatter: this.formatter, formatter: this.formatter,
}, },
{
label: "操作",
width: 240,
formatter: (row) => {
return (
<table-buttons
noAdd
noEdit
noDel
row={row}
onEdit={this.toEdit}
onView={this.toView}
onDel={this.toDel}
/>
);
},
},
], ],
}, },
}; };
......
device-manager-ui/admin/src/views/device/module/dialogshow.vue
View file @ 84e02b55
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<el-dialog :title="title" :visible.sync="open" width="90%" append-to-body> <el-dialog :title="title" :visible.sync="open" width="90%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<Field label="模块名称" prop="moduleId" v-model="form.moduleId" placeholder="请输入模块名称"/> <Field label="模块名称" prop="moduleName" v-model="form.moduleName" type="textarea" placeholder="请输入模块名称"/>
<Field label="所属设备" prop="deviceId" v-model="form.deviceId" placeholder="请输入所属设备"/> <Field label="模块消息编码，与上报消息头编码一致，唯一" prop="moduleMsgCode" v-model="form.moduleMsgCode" type="textarea" placeholder="请输入模块消息编码，与上报消息头编码一致，唯一"/>
</el-row> </el-row>
...@@ -36,8 +36,13 @@ ...@@ -36,8 +36,13 @@
], ],
// 表单校验 // 表单校验
rules: { rules: {
createTime: [ moduleName: [
{required: true,message: "请选择创建时间" }, {required: true,message: "请输入模块名称", trigger: "blur" },
{max: 256,message: "最多只能录入256个字符",trigger: "blur",},
],
moduleMsgCode: [
{required: true,message: "请输入模块消息编码，与上报消息头编码一致，唯一", trigger: "blur" },
{max: 256,message: "最多只能录入256个字符",trigger: "blur",},
], ],
} }
}; };
...@@ -88,8 +93,8 @@ ...@@ -88,8 +93,8 @@
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
moduleId : null, moduleName : "",
deviceId : null, moduleMsgCode : "",
}; };
this.resetForm("form"); this.resetForm("form");
}, },
......
device-manager-ui/admin/src/views/device/module/list.vue
View file @ 84e02b55
...@@ -13,31 +13,9 @@ ...@@ -13,31 +13,9 @@
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
export default { export default {
name: "DeviceModule", name: "DeviceModule",
props: {
queryIn: {
type: Object,
default: null,
},
},
components: {dialogShow }, components: {dialogShow },
mixins: [table], mixins: [table],
created() { created() {
console.log("queryIn module:", this.queryIn);
//this.config.addQuery = { deviceId, deviceType };
if (this.queryIn.deviceId) {
this.query["deviceId"] = this.queryIn.deviceId;
}
this.pageInfo.list = "/device/module/list";
this.pageInfo.del = "/device/module/delete";
this.pageInfo.add = "/device/module/add";
this.pageInfo.edit = "/device/module/edit";
this.pageInfo.view = "/device/module/view";
console.log("pageInfo",this.pageInfo)
}, },
methods: { methods: {
......
device-manager-ui/admin/src/views/device/module/use/dialogshow.vue
View file @ 84e02b55
...@@ -3,7 +3,9 @@ ...@@ -3,7 +3,9 @@
<el-dialog :title="title" :visible.sync="open" width="90%" append-to-body> <el-dialog :title="title" :visible.sync="open" width="90%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<Field label="模块ID" prop="moduleId" v-model="form.moduleId" placeholder="请输入模块ID"/> <Field label="模块名称" prop="moduleName" v-model="form.moduleName" type="textarea" placeholder="请输入模块名称"/>
<Field label="模块消息编码" prop="moduleMsgCode" v-model="form.moduleMsgCode" placeholder="请输入模块消息编码"/>
<Field label="所属设备" prop="deviceId" v-model="form.deviceId" placeholder="请输入所属设备"/>
<Field label="调用次数" prop="useNum" v-model="form.useNum" placeholder="请输入调用次数"/> <Field label="调用次数" prop="useNum" v-model="form.useNum" placeholder="请输入调用次数"/>
</el-row> </el-row>
...@@ -36,8 +38,9 @@ ...@@ -36,8 +38,9 @@
], ],
// 表单校验 // 表单校验
rules: { rules: {
createTime: [ moduleName: [
{required: true,message: "请选择创建时间" }, {required: true,message: "请输入模块名称", trigger: "blur" },
{max: 256,message: "最多只能录入256个字符",trigger: "blur",},
], ],
} }
}; };
...@@ -88,7 +91,9 @@ ...@@ -88,7 +91,9 @@
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
moduleId : null, moduleName : "",
moduleMsgCode : null,
deviceId : null,
useNum : null, useNum : null,
}; };
this.resetForm("form"); this.resetForm("form");
......
device-manager-ui/admin/src/views/system/param/dialogshow.vue
View file @ 84e02b55
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</template> </template>
<script> <script>
import form from "@/assets/mixins/form"; import form from "@/assets/mixins/formdialog";
export default { export default {
mixins: [form], mixins: [form],
data() { data() {
...@@ -82,6 +82,7 @@ export default { ...@@ -82,6 +82,7 @@ export default {
paramKey: [{ required: true, message: "请输入参数键", trigger: "blur" }], paramKey: [{ required: true, message: "请输入参数键", trigger: "blur" }],
paramValue: [{ required: true, message: "请输入参数值", trigger: "blur" }], paramValue: [{ required: true, message: "请输入参数值", trigger: "blur" }],
}, },
// urls:{list: "/para/file/list"}
}; };
}, },
......
device-manager/src/main/java/com/mortals/xhx/common/code/LogTypeEnum.java
View file @ 84e02b55
...@@ -9,8 +9,8 @@ import java.util.Map; ...@@ -9,8 +9,8 @@ import java.util.Map;
* @author zxfei * @author zxfei
*/ */
public enum LogTypeEnum { public enum LogTypeEnum {
上报事件(0, "上报事件"), 上报事件(0, "上行"),
下发服务(1, "下发服务"); 下发服务(1, "下行");
private Integer value; private Integer value;
private String desc; private String desc;
......
device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceMsgComsumerStartedService.java
View file @ 84e02b55
...@@ -181,7 +181,8 @@ public class DeviceMsgComsumerStartedService implements IApplicationStartedServi ...@@ -181,7 +181,8 @@ public class DeviceMsgComsumerStartedService implements IApplicationStartedServi
deviceLogEntity.initAttrValue(); deviceLogEntity.initAttrValue();
deviceLogEntity.setDeviceId(deviceEntity.getId()); deviceLogEntity.setDeviceId(deviceEntity.getId());
deviceLogEntity.setDeviceName(deviceEntity.getDeviceName()); deviceLogEntity.setDeviceName(deviceEntity.getDeviceName());
deviceLogEntity.setDeviceNum(deviceEntity.getDeviceCode()); deviceLogEntity.setDeviceCode(deviceEntity.getDeviceCode());
deviceLogEntity.setMessageHead(queueMsg.getHeaders().getData().get(MESSAGETYPE));
deviceLogEntity.setContent(JSONObject.toJSONString(deviceReq)); deviceLogEntity.setContent(JSONObject.toJSONString(deviceReq));
deviceLogEntity.setLogType(LogTypeEnum.上报事件.getValue()); deviceLogEntity.setLogType(LogTypeEnum.上报事件.getValue());
deviceLogEntity.setCreateUserId(1L); deviceLogEntity.setCreateUserId(1L);
......
device-manager/src/main/java/com/mortals/xhx/daemon/task/DeviceStatTaskImpl.java
View file @ 84e02b55
...@@ -12,9 +12,10 @@ import com.mortals.xhx.common.code.DeviceOnlineStatusEnum; ...@@ -12,9 +12,10 @@ import com.mortals.xhx.common.code.DeviceOnlineStatusEnum;
import com.mortals.xhx.common.code.DeviceMethodEnum; import com.mortals.xhx.common.code.DeviceMethodEnum;
import com.mortals.xhx.common.code.DeviceStatusEnum; import com.mortals.xhx.common.code.DeviceStatusEnum;
import com.mortals.xhx.common.key.ParamKey; import com.mortals.xhx.common.key.ParamKey;
import com.mortals.xhx.module.device.model.DeviceLogEntity; import com.mortals.xhx.module.device.model.*;
import com.mortals.xhx.module.device.model.DeviceLogQuery;
import com.mortals.xhx.module.device.service.DeviceLogService; import com.mortals.xhx.module.device.service.DeviceLogService;
import com.mortals.xhx.module.device.service.DeviceModuleService;
import com.mortals.xhx.module.device.service.DeviceModuleUseService;
import com.mortals.xhx.module.device.service.DeviceService; import com.mortals.xhx.module.device.service.DeviceService;
import com.mortals.xhx.module.platform.model.PlatformEntity; import com.mortals.xhx.module.platform.model.PlatformEntity;
import com.mortals.xhx.module.platform.service.PlatformService; import com.mortals.xhx.module.platform.service.PlatformService;
...@@ -26,6 +27,9 @@ import org.springframework.stereotype.Service; ...@@ -26,6 +27,9 @@ import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import java.util.Date; import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/** /**
* 设备状态任务 * 设备状态任务
...@@ -41,22 +45,88 @@ public class DeviceStatTaskImpl implements ITaskExcuteService { ...@@ -41,22 +45,88 @@ public class DeviceStatTaskImpl implements ITaskExcuteService {
private DeviceService deviceService; private DeviceService deviceService;
@Autowired @Autowired
private DeviceLogService deviceLogService; private DeviceLogService deviceLogService;
@Autowired
private DeviceModuleUseService deviceModuleUseService;
@Autowired @Autowired
private ParamService paramService; private ParamService paramService;
@Autowired @Autowired
private ProductService productService; private ProductService productService;
@Autowired @Autowired
private PlatformService platformService; private PlatformService platformService;
@Autowired
private DeviceModuleService moduleService;
@Override @Override
public void excuteTask(ITask task) throws AppException { public void excuteTask(ITask task) throws AppException {
log.debug("设备状态统计，开始执行"); log.debug("设备统计，开始执行");
doDeviceModuleUse();
//doDeviceUpOrDown(); //doDeviceUpOrDown();
//doDeviceLogDel(); //doDeviceLogDel();
log.debug("设备状态统计，结束执行"); log.debug("设备统计，结束执行");
}
/**
* 统计设备模块使用率
*/
private void doDeviceModuleUse() {
Map<String, DeviceModuleEntity> moduleMap = moduleService.find(new DeviceModuleQuery()).stream().collect(Collectors.toMap(x -> x.getModuleMsgCode(), y -> y, (o, n) -> n));
try {
// TODO: 2022/7/2 根据每个设备单独查询统计 计算数据量会减少
List<DeviceModuleUseEntity> moduleUseEntityList = deviceService.getCacheList().stream().flatMap(device -> {
//查询当前设备日志
List<DeviceLogEntity> deviceLogList = deviceLogService.find(new DeviceLogQuery().deviceId(device.getId()));
//分组统计每个模块头使用率
Map<String, Long> modelCollect = deviceLogList.parallelStream().collect(Collectors.groupingBy(DeviceLogEntity::getMessageHead, Collectors.counting()));
return modelCollect.entrySet().stream().map(item -> {
if (moduleMap.containsKey(item.getKey())) {
DeviceModuleUseEntity deviceModuleUseEntity = new DeviceModuleUseEntity();
deviceModuleUseEntity.initAttrValue();
DeviceModuleEntity deviceModuleEntity = moduleMap.get(item.getKey());
deviceModuleUseEntity.setDeviceId(device.getId());
deviceModuleUseEntity.setModuleMsgCode(deviceModuleEntity.getModuleMsgCode());
deviceModuleUseEntity.setModuleName(deviceModuleEntity.getModuleName());
deviceModuleUseEntity.setUseNum(item.getValue());
deviceModuleUseEntity.setCreateUserId(1L);
deviceModuleUseEntity.setCreateTime(new Date());
return deviceModuleUseEntity;
}
return null;
}).filter(f -> f != null);
}).collect(Collectors.toList());
if (!ObjectUtils.isEmpty(moduleUseEntityList)) {
//遍历，更新统计数据表 标识 设备id与消息头
Map<String, DeviceModuleUseEntity> collect = deviceModuleUseService.find(new DeviceModuleUseQuery()).stream().collect(Collectors.toMap(x -> x.getDeviceId() + "#" + x.getModuleMsgCode(), y -> y, (o, n) -> n));
moduleUseEntityList.stream().forEach(mudule -> {
String key = mudule.getDeviceId() + "#" + mudule.getModuleMsgCode();
if (collect.containsKey(key)) {
//更新
DeviceModuleUseEntity deviceModuleUseEntity = collect.get(key);
mudule.setId(deviceModuleUseEntity.getId());
mudule.setUpdateTime(new Date());
mudule.setUpdateUserId(1L);
deviceModuleUseService.update(mudule, null);
} else {
//新增
deviceModuleUseService.save(mudule, null);
}
});
}
} catch (Exception e) {
log.error("更新任务异常，结束执行", e);
}
} }
/** /**
* 统计更新设备状态 * 统计更新设备状态
*/ */
......
device-manager/src/main/java/com/mortals/xhx/module/device/dao/DeviceModuleDao.java
View file @ 84e02b55
...@@ -8,7 +8,7 @@ import java.util.List; ...@@ -8,7 +8,7 @@ import java.util.List;
* 设备模块信息 DAO接口 * 设备模块信息 DAO接口
* *
* @author zxfei * @author zxfei
* @date 2022-06-27 * @date 2022-07-02
*/ */
public interface DeviceModuleDao extends ICRUDDao<DeviceModuleEntity,Long>{ public interface DeviceModuleDao extends ICRUDDao<DeviceModuleEntity,Long>{
......
device-manager/src/main/java/com/mortals/xhx/module/device/dao/DeviceModuleUseDao.java
View file @ 84e02b55
...@@ -8,7 +8,7 @@ import java.util.List; ...@@ -8,7 +8,7 @@ import java.util.List;
* 设备模块使用频率 DAO接口 * 设备模块使用频率 DAO接口
* *
* @author zxfei * @author zxfei
* @date 2022-06-27 * @date 2022-07-02
*/ */
public interface DeviceModuleUseDao extends ICRUDDao<DeviceModuleUseEntity,Long>{ public interface DeviceModuleUseDao extends ICRUDDao<DeviceModuleUseEntity,Long>{
......
device-manager/src/main/java/com/mortals/xhx/module/device/dao/ibatis/DeviceModuleDaoImpl.java
View file @ 84e02b55
...@@ -11,7 +11,7 @@ import java.util.List; ...@@ -11,7 +11,7 @@ import java.util.List;
* 设备模块信息DaoImpl DAO接口 * 设备模块信息DaoImpl DAO接口
* *
* @author zxfei * @author zxfei
* @date 2022-06-27 * @date 2022-07-02
*/ */
@Repository("deviceModuleDao") @Repository("deviceModuleDao")
public class DeviceModuleDaoImpl extends BaseCRUDDaoMybatis<DeviceModuleEntity,Long> implements DeviceModuleDao { public class DeviceModuleDaoImpl extends BaseCRUDDaoMybatis<DeviceModuleEntity,Long> implements DeviceModuleDao {
......
device-manager/src/main/java/com/mortals/xhx/module/device/dao/ibatis/DeviceModuleUseDaoImpl.java
View file @ 84e02b55
...@@ -11,7 +11,7 @@ import java.util.List; ...@@ -11,7 +11,7 @@ import java.util.List;
* 设备模块使用频率DaoImpl DAO接口 * 设备模块使用频率DaoImpl DAO接口
* *
* @author zxfei * @author zxfei
* @date 2022-06-27 * @date 2022-07-02
*/ */
@Repository("deviceModuleUseDao") @Repository("deviceModuleUseDao")
public class DeviceModuleUseDaoImpl extends BaseCRUDDaoMybatis<DeviceModuleUseEntity,Long> implements DeviceModuleUseDao { public class DeviceModuleUseDaoImpl extends BaseCRUDDaoMybatis<DeviceModuleUseEntity,Long> implements DeviceModuleUseDao {
......
device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceLogEntity.java
View file @ 84e02b55
...@@ -7,124 +7,142 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,124 +7,142 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.device.model.vo.DeviceLogVo; import com.mortals.xhx.module.device.model.vo.DeviceLogVo;
/** /**
* 设备日志实体对象 * 设备日志实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-07-01 * @date 2022-07-02
*/ */
public class DeviceLogEntity extends DeviceLogVo { public class DeviceLogEntity extends DeviceLogVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* traceId,日志追踪id * traceId,日志追踪id
*/ */
private String traceID; private String traceID;
/** /**
* 设备ID * 设备ID
*/ */
private Long deviceId; private Long deviceId;
/** /**
* 设备编号 * 设备编号
*/ */
private String deviceNum; private String deviceCode;
/** /**
* 设备名称，设置设备名称。 * 设备名称，设置设备名称。
*/ */
private String deviceName; private String deviceName;
/** /**
* 日志类型，(0.上报事件，1.下发服务) * 业务消息头标识
*/ */
private String messageHead;
/**
* 消息类型，(0.上行，1.下行)
*/
private Integer logType; private Integer logType;
/** /**
* 内容 * 内容
*/ */
private String content; private String content;
public DeviceLogEntity(){} public DeviceLogEntity(){}
/** /**
* 获取 traceId,日志追踪id * 获取 traceId,日志追踪id
* @return String * @return String
*/ */
public String getTraceID(){ public String getTraceID(){
return traceID; return traceID;
} }
/** /**
* 设置 traceId,日志追踪id * 设置 traceId,日志追踪id
* @param traceID * @param traceID
*/ */
public void setTraceID(String traceID){ public void setTraceID(String traceID){
this.traceID = traceID; this.traceID = traceID;
} }
/** /**
* 获取 设备ID * 获取 设备ID
* @return Long * @return Long
*/ */
public Long getDeviceId(){ public Long getDeviceId(){
return deviceId; return deviceId;
} }
/** /**
* 设置 设备ID * 设置 设备ID
* @param deviceId * @param deviceId
*/ */
public void setDeviceId(Long deviceId){ public void setDeviceId(Long deviceId){
this.deviceId = deviceId; this.deviceId = deviceId;
} }
/** /**
* 获取 设备编号 * 获取 设备编号
* @return String * @return String
*/ */
public String getDeviceNum(){ public String getDeviceCode(){
return deviceNum; return deviceCode;
} }
/** /**
* 设置 设备编号 * 设置 设备编号
* @param deviceNum * @param deviceCode
*/ */
public void setDeviceNum(String deviceNum){ public void setDeviceCode(String deviceCode){
this.deviceNum = deviceNum; this.deviceCode = deviceCode;
} }
/** /**
* 获取 设备名称，设置设备名称。 * 获取 设备名称，设置设备名称。
* @return String * @return String
*/ */
public String getDeviceName(){ public String getDeviceName(){
return deviceName; return deviceName;
} }
/** /**
* 设置 设备名称，设置设备名称。 * 设置 设备名称，设置设备名称。
* @param deviceName * @param deviceName
*/ */
public void setDeviceName(String deviceName){ public void setDeviceName(String deviceName){
this.deviceName = deviceName; this.deviceName = deviceName;
} }
/** /**
* 获取 日志类型，(0.上报事件，1.下发服务) * 获取 业务消息头标识
* @return Integer * @return String
*/ */
public String getMessageHead(){
return messageHead;
}
/**
* 设置 业务消息头标识
* @param messageHead
*/
public void setMessageHead(String messageHead){
this.messageHead = messageHead;
}
/**
* 获取 消息类型，(0.上行，1.下行)
* @return Integer
*/
public Integer getLogType(){ public Integer getLogType(){
return logType; return logType;
} }
/** /**
* 设置 日志类型，(0.上报事件，1.下发服务) * 设置 消息类型，(0.上行，1.下行)
* @param logType * @param logType
*/ */
public void setLogType(Integer logType){ public void setLogType(Integer logType){
this.logType = logType; this.logType = logType;
} }
/** /**
* 获取 内容 * 获取 内容
* @return String * @return String
*/ */
public String getContent(){ public String getContent(){
return content; return content;
} }
/** /**
* 设置 内容 * 设置 内容
* @param content * @param content
*/ */
public void setContent(String content){ public void setContent(String content){
this.content = content; this.content = content;
} }
...@@ -134,7 +152,7 @@ public class DeviceLogEntity extends DeviceLogVo { ...@@ -134,7 +152,7 @@ public class DeviceLogEntity extends DeviceLogVo {
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
...@@ -142,7 +160,7 @@ public class DeviceLogEntity extends DeviceLogVo { ...@@ -142,7 +160,7 @@ public class DeviceLogEntity extends DeviceLogVo {
if (obj instanceof DeviceLogEntity) { if (obj instanceof DeviceLogEntity) {
DeviceLogEntity tmp = (DeviceLogEntity) obj; DeviceLogEntity tmp = (DeviceLogEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
...@@ -152,8 +170,9 @@ public class DeviceLogEntity extends DeviceLogVo { ...@@ -152,8 +170,9 @@ public class DeviceLogEntity extends DeviceLogVo {
StringBuilder sb = new StringBuilder(""); StringBuilder sb = new StringBuilder("");
sb.append(",traceID:").append(getTraceID()); sb.append(",traceID:").append(getTraceID());
sb.append(",deviceId:").append(getDeviceId()); sb.append(",deviceId:").append(getDeviceId());
sb.append(",deviceNum:").append(getDeviceNum()); sb.append(",deviceCode:").append(getDeviceCode());
sb.append(",deviceName:").append(getDeviceName()); sb.append(",deviceName:").append(getDeviceName());
sb.append(",messageHead:").append(getMessageHead());
sb.append(",logType:").append(getLogType()); sb.append(",logType:").append(getLogType());
sb.append(",content:").append(getContent()); sb.append(",content:").append(getContent());
return sb.toString(); return sb.toString();
...@@ -161,16 +180,18 @@ public class DeviceLogEntity extends DeviceLogVo { ...@@ -161,16 +180,18 @@ public class DeviceLogEntity extends DeviceLogVo {
public void initAttrValue(){ public void initAttrValue(){
this.traceID = ""; this.traceID = "";
this.deviceId = null;
this.deviceId = null; this.deviceCode = "";
this.deviceNum = ""; this.deviceName = "";
this.deviceName = ""; this.messageHead = "";
this.logType = null; this.logType = null;
this.content = ""; this.content = "";
} }
} }
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceLogQuery.java
View file @ 84e02b55
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.device.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.device.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.device.model.DeviceLogEntity; import com.mortals.xhx.module.device.model.DeviceLogEntity;
/** /**
* 设备日志查询对象 * 设备日志查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-07-01 * @date 2022-07-02
*/ */
public class DeviceLogQuery extends DeviceLogEntity { public class DeviceLogQuery extends DeviceLogEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -37,21 +37,24 @@ public class DeviceLogQuery extends DeviceLogEntity { ...@@ -37,21 +37,24 @@ public class DeviceLogQuery extends DeviceLogEntity {
private List <Long> deviceIdList; private List <Long> deviceIdList;
/** 设备编号 */ /** 设备编号 */
private List<String> deviceNumList; private List<String> deviceCodeList;
/** 设备名称，设置设备名称。 */ /** 设备名称，设置设备名称。 */
private List<String> deviceNameList; private List<String> deviceNameList;
/** 开始 日志类型，(0.上报事件，1.下发服务) */ /** 业务消息头标识 */
private List<String> messageHeadList;
/** 开始 消息类型，(0.上行，1.下行) */
private Integer logTypeStart; private Integer logTypeStart;
/** 结束 日志类型，(0.上报事件，1.下发服务) */ /** 结束 消息类型，(0.上行，1.下行) */
private Integer logTypeEnd; private Integer logTypeEnd;
/** 增加 日志类型，(0.上报事件，1.下发服务) */ /** 增加 消息类型，(0.上行，1.下行) */
private Integer logTypeIncrement; private Integer logTypeIncrement;
/** 日志类型，(0.上报事件，1.下发服务)列表 */ /** 消息类型，(0.上行，1.下行)列表 */
private List <Integer> logTypeList; private List <Integer> logTypeList;
/** 内容 */ /** 内容 */
...@@ -102,780 +105,814 @@ public class DeviceLogQuery extends DeviceLogEntity { ...@@ -102,780 +105,814 @@ public class DeviceLogQuery extends DeviceLogEntity {
public DeviceLogQuery(){} public DeviceLogQuery(){}
/** /**
* 获取 开始 主键ID，主键，自增长 * 获取 开始 主键ID，主键，自增长
* @return idStart * @return idStart
*/ */
public Long getIdStart(){ public Long getIdStart(){
return this.idStart; return this.idStart;
} }
/** /**
* 设置 开始 主键ID，主键，自增长 * 设置 开始 主键ID，主键，自增长
* @param idStart * @param idStart
*/ */
public void setIdStart(Long idStart){ public void setIdStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
} }
/** /**
* 获取 结束 主键ID，主键，自增长 * 获取 结束 主键ID，主键，自增长
* @return $idEnd * @return $idEnd
*/ */
public Long getIdEnd(){ public Long getIdEnd(){
return this.idEnd; return this.idEnd;
} }
/** /**
* 设置 结束 主键ID，主键，自增长 * 设置 结束 主键ID，主键，自增长
* @param idEnd * @param idEnd
*/ */
public void setIdEnd(Long idEnd){ public void setIdEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
} }
/** /**
* 获取 增加 主键ID，主键，自增长 * 获取 增加 主键ID，主键，自增长
* @return idIncrement * @return idIncrement
*/ */
public Long getIdIncrement(){ public Long getIdIncrement(){
return this.idIncrement; return this.idIncrement;
} }
/** /**
* 设置 增加 主键ID，主键，自增长 * 设置 增加 主键ID，主键，自增长
* @param idIncrement * @param idIncrement
*/ */
public void setIdIncrement(Long idIncrement){ public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
} }
/** /**
* 获取 主键ID，主键，自增长 * 获取 主键ID，主键，自增长
* @return idList * @return idList
*/ */
public List<Long> getIdList(){ public List<Long> getIdList(){
return this.idList; return this.idList;
} }
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param idList * @param idList
*/ */
public void setIdList(List<Long> idList){ public void setIdList(List<Long> idList){
this.idList = idList; this.idList = idList;
} }
/** /**
* 获取 traceId,日志追踪id * 获取 traceId,日志追踪id
* @return traceIDList * @return traceIDList
*/ */
public List<String> getTraceIDList(){ public List<String> getTraceIDList(){
return this.traceIDList; return this.traceIDList;
} }
/** /**
* 设置 traceId,日志追踪id * 设置 traceId,日志追踪id
* @param traceIDList * @param traceIDList
*/ */
public void setTraceIDList(List<String> traceIDList){ public void setTraceIDList(List<String> traceIDList){
this.traceIDList = traceIDList; this.traceIDList = traceIDList;
} }
/** /**
* 获取 开始 设备ID * 获取 开始 设备ID
* @return deviceIdStart * @return deviceIdStart
*/ */
public Long getDeviceIdStart(){ public Long getDeviceIdStart(){
return this.deviceIdStart; return this.deviceIdStart;
} }
/** /**
* 设置 开始 设备ID * 设置 开始 设备ID
* @param deviceIdStart * @param deviceIdStart
*/ */
public void setDeviceIdStart(Long deviceIdStart){ public void setDeviceIdStart(Long deviceIdStart){
this.deviceIdStart = deviceIdStart; this.deviceIdStart = deviceIdStart;
} }
/** /**
* 获取 结束 设备ID * 获取 结束 设备ID
* @return $deviceIdEnd * @return $deviceIdEnd
*/ */
public Long getDeviceIdEnd(){ public Long getDeviceIdEnd(){
return this.deviceIdEnd; return this.deviceIdEnd;
} }
/** /**
* 设置 结束 设备ID * 设置 结束 设备ID
* @param deviceIdEnd * @param deviceIdEnd
*/ */
public void setDeviceIdEnd(Long deviceIdEnd){ public void setDeviceIdEnd(Long deviceIdEnd){
this.deviceIdEnd = deviceIdEnd; this.deviceIdEnd = deviceIdEnd;
} }
/** /**
* 获取 增加 设备ID * 获取 增加 设备ID
* @return deviceIdIncrement * @return deviceIdIncrement
*/ */
public Long getDeviceIdIncrement(){ public Long getDeviceIdIncrement(){
return this.deviceIdIncrement; return this.deviceIdIncrement;
} }
/** /**
* 设置 增加 设备ID * 设置 增加 设备ID
* @param deviceIdIncrement * @param deviceIdIncrement
*/ */
public void setDeviceIdIncrement(Long deviceIdIncrement){ public void setDeviceIdIncrement(Long deviceIdIncrement){
this.deviceIdIncrement = deviceIdIncrement; this.deviceIdIncrement = deviceIdIncrement;
} }
/** /**
* 获取 设备ID * 获取 设备ID
* @return deviceIdList * @return deviceIdList
*/ */
public List<Long> getDeviceIdList(){ public List<Long> getDeviceIdList(){
return this.deviceIdList; return this.deviceIdList;
} }
/** /**
* 设置 设备ID * 设置 设备ID
* @param deviceIdList * @param deviceIdList
*/ */
public void setDeviceIdList(List<Long> deviceIdList){ public void setDeviceIdList(List<Long> deviceIdList){
this.deviceIdList = deviceIdList; this.deviceIdList = deviceIdList;
} }
/** /**
* 获取 设备编号 * 获取 设备编号
* @return deviceNumList * @return deviceCodeList
*/ */
public List<String> getDeviceNumList(){ public List<String> getDeviceCodeList(){
return this.deviceNumList; return this.deviceCodeList;
} }
/** /**
* 设置 设备编号 * 设置 设备编号
* @param deviceNumList * @param deviceCodeList
*/ */
public void setDeviceNumList(List<String> deviceNumList){ public void setDeviceCodeList(List<String> deviceCodeList){
this.deviceNumList = deviceNumList; this.deviceCodeList = deviceCodeList;
} }
/** /**
* 获取 设备名称，设置设备名称。 * 获取 设备名称，设置设备名称。
* @return deviceNameList * @return deviceNameList
*/ */
public List<String> getDeviceNameList(){ public List<String> getDeviceNameList(){
return this.deviceNameList; return this.deviceNameList;
} }
/** /**
* 设置 设备名称，设置设备名称。 * 设置 设备名称，设置设备名称。
* @param deviceNameList * @param deviceNameList
*/ */
public void setDeviceNameList(List<String> deviceNameList){ public void setDeviceNameList(List<String> deviceNameList){
this.deviceNameList = deviceNameList; this.deviceNameList = deviceNameList;
} }
/** /**
* 获取 开始 日志类型，(0.上报事件，1.下发服务) * 获取 业务消息头标识
* @return logTypeStart * @return messageHeadList
*/ */
public List<String> getMessageHeadList(){
return this.messageHeadList;
}
/**
* 设置 业务消息头标识
* @param messageHeadList
*/
public void setMessageHeadList(List<String> messageHeadList){
this.messageHeadList = messageHeadList;
}
/**
* 获取 开始 消息类型，(0.上行，1.下行)
* @return logTypeStart
*/
public Integer getLogTypeStart(){ public Integer getLogTypeStart(){
return this.logTypeStart; return this.logTypeStart;
} }
/** /**
* 设置 开始 日志类型，(0.上报事件，1.下发服务) * 设置 开始 消息类型，(0.上行，1.下行)
* @param logTypeStart * @param logTypeStart
*/ */
public void setLogTypeStart(Integer logTypeStart){ public void setLogTypeStart(Integer logTypeStart){
this.logTypeStart = logTypeStart; this.logTypeStart = logTypeStart;
} }
/** /**
* 获取 结束 日志类型，(0.上报事件，1.下发服务) * 获取 结束 消息类型，(0.上行，1.下行)
* @return $logTypeEnd * @return $logTypeEnd
*/ */
public Integer getLogTypeEnd(){ public Integer getLogTypeEnd(){
return this.logTypeEnd; return this.logTypeEnd;
} }
/** /**
* 设置 结束 日志类型，(0.上报事件，1.下发服务) * 设置 结束 消息类型，(0.上行，1.下行)
* @param logTypeEnd * @param logTypeEnd
*/ */
public void setLogTypeEnd(Integer logTypeEnd){ public void setLogTypeEnd(Integer logTypeEnd){
this.logTypeEnd = logTypeEnd; this.logTypeEnd = logTypeEnd;
} }
/** /**
* 获取 增加 日志类型，(0.上报事件，1.下发服务) * 获取 增加 消息类型，(0.上行，1.下行)
* @return logTypeIncrement * @return logTypeIncrement
*/ */
public Integer getLogTypeIncrement(){ public Integer getLogTypeIncrement(){
return this.logTypeIncrement; return this.logTypeIncrement;
} }
/** /**
* 设置 增加 日志类型，(0.上报事件，1.下发服务) * 设置 增加 消息类型，(0.上行，1.下行)
* @param logTypeIncrement * @param logTypeIncrement
*/ */
public void setLogTypeIncrement(Integer logTypeIncrement){ public void setLogTypeIncrement(Integer logTypeIncrement){
this.logTypeIncrement = logTypeIncrement; this.logTypeIncrement = logTypeIncrement;
} }
/** /**
* 获取 日志类型，(0.上报事件，1.下发服务) * 获取 消息类型，(0.上行，1.下行)
* @return logTypeList * @return logTypeList
*/ */
public List<Integer> getLogTypeList(){ public List<Integer> getLogTypeList(){
return this.logTypeList; return this.logTypeList;
} }
/** /**
* 设置 日志类型，(0.上报事件，1.下发服务) * 设置 消息类型，(0.上行，1.下行)
* @param logTypeList * @param logTypeList
*/ */
public void setLogTypeList(List<Integer> logTypeList){ public void setLogTypeList(List<Integer> logTypeList){
this.logTypeList = logTypeList; this.logTypeList = logTypeList;
} }
/** /**
* 获取 内容 * 获取 内容
* @return contentList * @return contentList
*/ */
public List<String> getContentList(){ public List<String> getContentList(){
return this.contentList; return this.contentList;
} }
/** /**
* 设置 内容 * 设置 内容
* @param contentList * @param contentList
*/ */
public void setContentList(List<String> contentList){ public void setContentList(List<String> contentList){
this.contentList = contentList; this.contentList = contentList;
} }
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
*/ */
public Long getCreateUserIdStart(){ public Long getCreateUserIdStart(){
return this.createUserIdStart; return this.createUserIdStart;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public void setCreateUserIdStart(Long createUserIdStart){ public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
} }
/** /**
* 获取 结束 创建用户 * 获取 结束 创建用户
* @return $createUserIdEnd * @return $createUserIdEnd
*/ */
public Long getCreateUserIdEnd(){ public Long getCreateUserIdEnd(){
return this.createUserIdEnd; return this.createUserIdEnd;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public void setCreateUserIdEnd(Long createUserIdEnd){ public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
} }
/** /**
* 获取 增加 创建用户 * 获取 增加 创建用户
* @return createUserIdIncrement * @return createUserIdIncrement
*/ */
public Long getCreateUserIdIncrement(){ public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement; return this.createUserIdIncrement;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public void setCreateUserIdIncrement(Long createUserIdIncrement){ public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
} }
/** /**
* 获取 创建用户 * 获取 创建用户
* @return createUserIdList * @return createUserIdList
*/ */
public List<Long> getCreateUserIdList(){ public List<Long> getCreateUserIdList(){
return this.createUserIdList; return this.createUserIdList;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public void setCreateUserIdList(List<Long> createUserIdList){ public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
*/ */
public String getCreateTimeStart(){ public String getCreateTimeStart(){
return this.createTimeStart; return this.createTimeStart;
} }
/** /**
* 设置 开始 创建时间 * 设置 开始 创建时间
* @param createTimeStart * @param createTimeStart
*/ */
public void setCreateTimeStart(String createTimeStart){ public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart; this.createTimeStart = createTimeStart;
} }
/** /**
* 获取 结束 创建时间 * 获取 结束 创建时间
* @return createTimeEnd * @return createTimeEnd
*/ */
public String getCreateTimeEnd(){ public String getCreateTimeEnd(){
return this.createTimeEnd; return this.createTimeEnd;
} }
/** /**
* 设置 结束 创建时间 * 设置 结束 创建时间
* @param createTimeEnd * @param createTimeEnd
*/ */
public void setCreateTimeEnd(String createTimeEnd){ public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd; this.createTimeEnd = createTimeEnd;
} }
/** /**
* 获取 开始 更新用户 * 获取 开始 更新用户
* @return updateUserIdStart * @return updateUserIdStart
*/ */
public Long getUpdateUserIdStart(){ public Long getUpdateUserIdStart(){
return this.updateUserIdStart; return this.updateUserIdStart;
} }
/** /**
* 设置 开始 更新用户 * 设置 开始 更新用户
* @param updateUserIdStart * @param updateUserIdStart
*/ */
public void setUpdateUserIdStart(Long updateUserIdStart){ public void setUpdateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart; this.updateUserIdStart = updateUserIdStart;
} }
/** /**
* 获取 结束 更新用户 * 获取 结束 更新用户
* @return $updateUserIdEnd * @return $updateUserIdEnd
*/ */
public Long getUpdateUserIdEnd(){ public Long getUpdateUserIdEnd(){
return this.updateUserIdEnd; return this.updateUserIdEnd;
} }
/** /**
* 设置 结束 更新用户 * 设置 结束 更新用户
* @param updateUserIdEnd * @param updateUserIdEnd
*/ */
public void setUpdateUserIdEnd(Long updateUserIdEnd){ public void setUpdateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd; this.updateUserIdEnd = updateUserIdEnd;
} }
/** /**
* 获取 增加 更新用户 * 获取 增加 更新用户
* @return updateUserIdIncrement * @return updateUserIdIncrement
*/ */
public Long getUpdateUserIdIncrement(){ public Long getUpdateUserIdIncrement(){
return this.updateUserIdIncrement; return this.updateUserIdIncrement;
} }
/** /**
* 设置 增加 更新用户 * 设置 增加 更新用户
* @param updateUserIdIncrement * @param updateUserIdIncrement
*/ */
public void setUpdateUserIdIncrement(Long updateUserIdIncrement){ public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement; this.updateUserIdIncrement = updateUserIdIncrement;
} }
/** /**
* 获取 更新用户 * 获取 更新用户
* @return updateUserIdList * @return updateUserIdList
*/ */
public List<Long> getUpdateUserIdList(){ public List<Long> getUpdateUserIdList(){
return this.updateUserIdList; return this.updateUserIdList;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdList * @param updateUserIdList
*/ */
public void setUpdateUserIdList(List<Long> updateUserIdList){ public void setUpdateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/** /**
* 获取 开始 更新时间 * 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
*/ */
public String getUpdateTimeStart(){ public String getUpdateTimeStart(){
return this.updateTimeStart; return this.updateTimeStart;
} }
/** /**
* 设置 开始 更新时间 * 设置 开始 更新时间
* @param updateTimeStart * @param updateTimeStart
*/ */
public void setUpdateTimeStart(String updateTimeStart){ public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart; this.updateTimeStart = updateTimeStart;
} }
/** /**
* 获取 结束 更新时间 * 获取 结束 更新时间
* @return updateTimeEnd * @return updateTimeEnd
*/ */
public String getUpdateTimeEnd(){ public String getUpdateTimeEnd(){
return this.updateTimeEnd; return this.updateTimeEnd;
} }
/** /**
* 设置 结束 更新时间 * 设置 结束 更新时间
* @param updateTimeEnd * @param updateTimeEnd
*/ */
public void setUpdateTimeEnd(String updateTimeEnd){ public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param id * @param id
*/ */
public DeviceLogQuery id(Long id){ public DeviceLogQuery id(Long id){
setId(id); setId(id);
return this; return this;
} }
/** /**
* 设置 开始 主键ID，主键，自增长 * 设置 开始 主键ID，主键，自增长
* @param idStart * @param idStart
*/ */
public DeviceLogQuery idStart(Long idStart){ public DeviceLogQuery idStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
return this; return this;
} }
/** /**
* 设置 结束 主键ID，主键，自增长 * 设置 结束 主键ID，主键，自增长
* @param idEnd * @param idEnd
*/ */
public DeviceLogQuery idEnd(Long idEnd){ public DeviceLogQuery idEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
return this; return this;
} }
/** /**
* 设置 增加 主键ID，主键，自增长 * 设置 增加 主键ID，主键，自增长
* @param idIncrement * @param idIncrement
*/ */
public DeviceLogQuery idIncrement(Long idIncrement){ public DeviceLogQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
return this; return this;
} }
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param idList * @param idList
*/ */
public DeviceLogQuery idList(List<Long> idList){ public DeviceLogQuery idList(List<Long> idList){
this.idList = idList; this.idList = idList;
return this; return this;
} }
/** /**
* 设置 traceId,日志追踪id * 设置 traceId,日志追踪id
* @param traceID * @param traceID
*/ */
public DeviceLogQuery traceID(String traceID){ public DeviceLogQuery traceID(String traceID){
setTraceID(traceID); setTraceID(traceID);
return this; return this;
} }
/** /**
* 设置 traceId,日志追踪id * 设置 traceId,日志追踪id
* @param traceIDList * @param traceIDList
*/ */
public DeviceLogQuery traceIDList(List<String> traceIDList){ public DeviceLogQuery traceIDList(List<String> traceIDList){
this.traceIDList = traceIDList; this.traceIDList = traceIDList;
return this; return this;
} }
/** /**
* 设置 设备ID * 设置 设备ID
* @param deviceId * @param deviceId
*/ */
public DeviceLogQuery deviceId(Long deviceId){ public DeviceLogQuery deviceId(Long deviceId){
setDeviceId(deviceId); setDeviceId(deviceId);
return this; return this;
} }
/** /**
* 设置 开始 设备ID * 设置 开始 设备ID
* @param deviceIdStart * @param deviceIdStart
*/ */
public DeviceLogQuery deviceIdStart(Long deviceIdStart){ public DeviceLogQuery deviceIdStart(Long deviceIdStart){
this.deviceIdStart = deviceIdStart; this.deviceIdStart = deviceIdStart;
return this; return this;
} }
/** /**
* 设置 结束 设备ID * 设置 结束 设备ID
* @param deviceIdEnd * @param deviceIdEnd
*/ */
public DeviceLogQuery deviceIdEnd(Long deviceIdEnd){ public DeviceLogQuery deviceIdEnd(Long deviceIdEnd){
this.deviceIdEnd = deviceIdEnd; this.deviceIdEnd = deviceIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 设备ID * 设置 增加 设备ID
* @param deviceIdIncrement * @param deviceIdIncrement
*/ */
public DeviceLogQuery deviceIdIncrement(Long deviceIdIncrement){ public DeviceLogQuery deviceIdIncrement(Long deviceIdIncrement){
this.deviceIdIncrement = deviceIdIncrement; this.deviceIdIncrement = deviceIdIncrement;
return this; return this;
} }
/** /**
* 设置 设备ID * 设置 设备ID
* @param deviceIdList * @param deviceIdList
*/ */
public DeviceLogQuery deviceIdList(List<Long> deviceIdList){ public DeviceLogQuery deviceIdList(List<Long> deviceIdList){
this.deviceIdList = deviceIdList; this.deviceIdList = deviceIdList;
return this; return this;
} }
/** /**
* 设置 设备编号 * 设置 设备编号
* @param deviceNum * @param deviceCode
*/ */
public DeviceLogQuery deviceNum(String deviceNum){ public DeviceLogQuery deviceCode(String deviceCode){
setDeviceNum(deviceNum); setDeviceCode(deviceCode);
return this; return this;
} }
/** /**
* 设置 设备编号 * 设置 设备编号
* @param deviceNumList * @param deviceCodeList
*/ */
public DeviceLogQuery deviceNumList(List<String> deviceNumList){ public DeviceLogQuery deviceCodeList(List<String> deviceCodeList){
this.deviceNumList = deviceNumList; this.deviceCodeList = deviceCodeList;
return this; return this;
} }
/** /**
* 设置 设备名称，设置设备名称。 * 设置 设备名称，设置设备名称。
* @param deviceName * @param deviceName
*/ */
public DeviceLogQuery deviceName(String deviceName){ public DeviceLogQuery deviceName(String deviceName){
setDeviceName(deviceName); setDeviceName(deviceName);
return this; return this;
} }
/** /**
* 设置 设备名称，设置设备名称。 * 设置 设备名称，设置设备名称。
* @param deviceNameList * @param deviceNameList
*/ */
public DeviceLogQuery deviceNameList(List<String> deviceNameList){ public DeviceLogQuery deviceNameList(List<String> deviceNameList){
this.deviceNameList = deviceNameList; this.deviceNameList = deviceNameList;
return this; return this;
}
/**
* 设置 业务消息头标识
* @param messageHead
*/
public DeviceLogQuery messageHead(String messageHead){
setMessageHead(messageHead);
return this;
}
/**
* 设置 业务消息头标识
* @param messageHeadList
*/
public DeviceLogQuery messageHeadList(List<String> messageHeadList){
this.messageHeadList = messageHeadList;
return this;
} }
/** /**
* 设置 日志类型，(0.上报事件，1.下发服务) * 设置 消息类型，(0.上行，1.下行)
* @param logType * @param logType
*/ */
public DeviceLogQuery logType(Integer logType){ public DeviceLogQuery logType(Integer logType){
setLogType(logType); setLogType(logType);
return this; return this;
} }
/** /**
* 设置 开始 日志类型，(0.上报事件，1.下发服务) * 设置 开始 消息类型，(0.上行，1.下行)
* @param logTypeStart * @param logTypeStart
*/ */
public DeviceLogQuery logTypeStart(Integer logTypeStart){ public DeviceLogQuery logTypeStart(Integer logTypeStart){
this.logTypeStart = logTypeStart; this.logTypeStart = logTypeStart;
return this; return this;
} }
/** /**
* 设置 结束 日志类型，(0.上报事件，1.下发服务) * 设置 结束 消息类型，(0.上行，1.下行)
* @param logTypeEnd * @param logTypeEnd
*/ */
public DeviceLogQuery logTypeEnd(Integer logTypeEnd){ public DeviceLogQuery logTypeEnd(Integer logTypeEnd){
this.logTypeEnd = logTypeEnd; this.logTypeEnd = logTypeEnd;
return this; return this;
} }
/** /**
* 设置 增加 日志类型，(0.上报事件，1.下发服务) * 设置 增加 消息类型，(0.上行，1.下行)
* @param logTypeIncrement * @param logTypeIncrement
*/ */
public DeviceLogQuery logTypeIncrement(Integer logTypeIncrement){ public DeviceLogQuery logTypeIncrement(Integer logTypeIncrement){
this.logTypeIncrement = logTypeIncrement; this.logTypeIncrement = logTypeIncrement;
return this; return this;
} }
/** /**
* 设置 日志类型，(0.上报事件，1.下发服务) * 设置 消息类型，(0.上行，1.下行)
* @param logTypeList * @param logTypeList
*/ */
public DeviceLogQuery logTypeList(List<Integer> logTypeList){ public DeviceLogQuery logTypeList(List<Integer> logTypeList){
this.logTypeList = logTypeList; this.logTypeList = logTypeList;
return this; return this;
} }
/** /**
* 设置 内容 * 设置 内容
* @param content * @param content
*/ */
public DeviceLogQuery content(String content){ public DeviceLogQuery content(String content){
setContent(content); setContent(content);
return this; return this;
} }
/** /**
* 设置 内容 * 设置 内容
* @param contentList * @param contentList
*/ */
public DeviceLogQuery contentList(List<String> contentList){ public DeviceLogQuery contentList(List<String> contentList){
this.contentList = contentList; this.contentList = contentList;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
*/ */
public DeviceLogQuery createUserId(Long createUserId){ public DeviceLogQuery createUserId(Long createUserId){
setCreateUserId(createUserId); setCreateUserId(createUserId);
return this; return this;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public DeviceLogQuery createUserIdStart(Long createUserIdStart){ public DeviceLogQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public DeviceLogQuery createUserIdEnd(Long createUserIdEnd){ public DeviceLogQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public DeviceLogQuery createUserIdIncrement(Long createUserIdIncrement){ public DeviceLogQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public DeviceLogQuery createUserIdList(List<Long> createUserIdList){ public DeviceLogQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
return this; return this;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserId * @param updateUserId
*/ */
public DeviceLogQuery updateUserId(Long updateUserId){ public DeviceLogQuery updateUserId(Long updateUserId){
setUpdateUserId(updateUserId); setUpdateUserId(updateUserId);
return this; return this;
} }
/** /**
* 设置 开始 更新用户 * 设置 开始 更新用户
* @param updateUserIdStart * @param updateUserIdStart
*/ */
public DeviceLogQuery updateUserIdStart(Long updateUserIdStart){ public DeviceLogQuery updateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart; this.updateUserIdStart = updateUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 更新用户 * 设置 结束 更新用户
* @param updateUserIdEnd * @param updateUserIdEnd
*/ */
public DeviceLogQuery updateUserIdEnd(Long updateUserIdEnd){ public DeviceLogQuery updateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd; this.updateUserIdEnd = updateUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 更新用户 * 设置 增加 更新用户
* @param updateUserIdIncrement * @param updateUserIdIncrement
*/ */
public DeviceLogQuery updateUserIdIncrement(Long updateUserIdIncrement){ public DeviceLogQuery updateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement; this.updateUserIdIncrement = updateUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdList * @param updateUserIdList
*/ */
public DeviceLogQuery updateUserIdList(List<Long> updateUserIdList){ public DeviceLogQuery updateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
return this; return this;
} }
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
*/ */
public List<DeviceLogQuery> getOrConditionList(){ public List<DeviceLogQuery> getOrConditionList(){
return this.orConditionList; return this.orConditionList;
} }
/** /**
* 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList * @param orConditionList
*/ */
public void setOrConditionList(List<DeviceLogQuery> orConditionList){ public void setOrConditionList(List<DeviceLogQuery> orConditionList){
this.orConditionList = orConditionList; this.orConditionList = orConditionList;
} }
/** /**
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList * @return andConditionList
*/ */
public List<DeviceLogQuery> getAndConditionList(){ public List<DeviceLogQuery> getAndConditionList(){
return this.andConditionList; return this.andConditionList;
} }
/** /**
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList * @param andConditionList
*/ */
public void setAndConditionList(List<DeviceLogQuery> andConditionList){ public void setAndConditionList(List<DeviceLogQuery> andConditionList){
this.andConditionList = andConditionList; this.andConditionList = andConditionList;
} }
......
device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceModuleEntity.java
View file @ 84e02b55
...@@ -10,7 +10,7 @@ import com.mortals.xhx.module.device.model.vo.DeviceModuleVo; ...@@ -10,7 +10,7 @@ import com.mortals.xhx.module.device.model.vo.DeviceModuleVo;
* 设备模块信息实体对象 * 设备模块信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-07-01 * @date 2022-07-02
*/ */
public class DeviceModuleEntity extends DeviceModuleVo { public class DeviceModuleEntity extends DeviceModuleVo {
...@@ -19,42 +19,42 @@ public class DeviceModuleEntity extends DeviceModuleVo { ...@@ -19,42 +19,42 @@ public class DeviceModuleEntity extends DeviceModuleVo {
/** /**
* 模块名称 * 模块名称
*/ */
private Long moduleId; private String moduleName;
/** /**
* 所属设备 * 模块消息编码，与上报消息头编码一致，唯一
*/ */
private Long deviceId; private String moduleMsgCode;
public DeviceModuleEntity(){} public DeviceModuleEntity(){}
/** /**
* 获取 模块名称 * 获取 模块名称
* @return Long * @return String
*/ */
public Long getModuleId(){ public String getModuleName(){
return moduleId; return moduleName;
} }
/** /**
* 设置 模块名称 * 设置 模块名称
* @param moduleId * @param moduleName
*/ */
public void setModuleId(Long moduleId){ public void setModuleName(String moduleName){
this.moduleId = moduleId; this.moduleName = moduleName;
} }
/** /**
* 获取 所属设备 * 获取 模块消息编码，与上报消息头编码一致，唯一
* @return Long * @return String
*/ */
public Long getDeviceId(){ public String getModuleMsgCode(){
return deviceId; return moduleMsgCode;
} }
/** /**
* 设置 所属设备 * 设置 模块消息编码，与上报消息头编码一致，唯一
* @param deviceId * @param moduleMsgCode
*/ */
public void setDeviceId(Long deviceId){ public void setModuleMsgCode(String moduleMsgCode){
this.deviceId = deviceId; this.moduleMsgCode = moduleMsgCode;
} }
...@@ -78,15 +78,15 @@ public class DeviceModuleEntity extends DeviceModuleVo { ...@@ -78,15 +78,15 @@ public class DeviceModuleEntity extends DeviceModuleVo {
public String toString(){ public String toString(){
StringBuilder sb = new StringBuilder(""); StringBuilder sb = new StringBuilder("");
sb.append(",moduleId:").append(getModuleId()); sb.append(",moduleName:").append(getModuleName());
sb.append(",deviceId:").append(getDeviceId()); sb.append(",moduleMsgCode:").append(getModuleMsgCode());
return sb.toString(); return sb.toString();
} }
public void initAttrValue(){ public void initAttrValue(){
this.moduleId = null; this.moduleName = "";
this.deviceId = null; this.moduleMsgCode = "";
} }
} }
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceModuleQuery.java
View file @ 84e02b55
...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.device.model.DeviceModuleEntity; ...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.device.model.DeviceModuleEntity;
* 设备模块信息查询对象 * 设备模块信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-07-01 * @date 2022-07-02
*/ */
public class DeviceModuleQuery extends DeviceModuleEntity { public class DeviceModuleQuery extends DeviceModuleEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
...@@ -21,29 +21,11 @@ public class DeviceModuleQuery extends DeviceModuleEntity { ...@@ -21,29 +21,11 @@ public class DeviceModuleQuery extends DeviceModuleEntity {
/** 主键ID，主键，自增长列表 */ /** 主键ID，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 开始 模块名称 */ /** 模块名称 */
private Long moduleIdStart; private List<String> moduleNameList;
/** 结束 模块名称 */ /** 模块消息编码，与上报消息头编码一致，唯一 */
private Long moduleIdEnd; private List<String> moduleMsgCodeList;
/** 增加 模块名称 */
private Long moduleIdIncrement;
/** 模块名称列表 */
private List <Long> moduleIdList;
/** 开始 所属设备 */
private Long deviceIdStart;
/** 结束 所属设备 */
private Long deviceIdEnd;
/** 增加 所属设备 */
private Long deviceIdIncrement;
/** 所属设备列表 */
private List <Long> deviceIdList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -141,134 +123,36 @@ public class DeviceModuleQuery extends DeviceModuleEntity { ...@@ -141,134 +123,36 @@ public class DeviceModuleQuery extends DeviceModuleEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 开始 模块名称
* @return moduleIdStart
*/
public Long getModuleIdStart(){
return this.moduleIdStart;
}
/**
* 设置 开始 模块名称
* @param moduleIdStart
*/
public void setModuleIdStart(Long moduleIdStart){
this.moduleIdStart = moduleIdStart;
}
/**
* 获取 结束 模块名称
* @return $moduleIdEnd
*/
public Long getModuleIdEnd(){
return this.moduleIdEnd;
}
/**
* 设置 结束 模块名称
* @param moduleIdEnd
*/
public void setModuleIdEnd(Long moduleIdEnd){
this.moduleIdEnd = moduleIdEnd;
}
/**
* 获取 增加 模块名称
* @return moduleIdIncrement
*/
public Long getModuleIdIncrement(){
return this.moduleIdIncrement;
}
/**
* 设置 增加 模块名称
* @param moduleIdIncrement
*/
public void setModuleIdIncrement(Long moduleIdIncrement){
this.moduleIdIncrement = moduleIdIncrement;
}
/** /**
* 获取 模块名称 * 获取 模块名称
* @return moduleIdList * @return moduleNameList
*/ */
public List<Long> getModuleIdList(){ public List<String> getModuleNameList(){
return this.moduleIdList; return this.moduleNameList;
} }
/** /**
* 设置 模块名称 * 设置 模块名称
* @param moduleIdList * @param moduleNameList
*/
public void setModuleIdList(List<Long> moduleIdList){
this.moduleIdList = moduleIdList;
}
/**
* 获取 开始 所属设备
* @return deviceIdStart
*/ */
public Long getDeviceIdStart(){ public void setModuleNameList(List<String> moduleNameList){
return this.deviceIdStart; this.moduleNameList = moduleNameList;
} }
/**
* 设置 开始 所属设备
* @param deviceIdStart
*/
public void setDeviceIdStart(Long deviceIdStart){
this.deviceIdStart = deviceIdStart;
}
/** /**
* 获取 结束 所属设备 * 获取 模块消息编码，与上报消息头编码一致，唯一
* @return $deviceIdEnd * @return moduleMsgCodeList
*/ */
public Long getDeviceIdEnd(){ public List<String> getModuleMsgCodeList(){
return this.deviceIdEnd; return this.moduleMsgCodeList;
} }
/** /**
* 设置 结束 所属设备 * 设置 模块消息编码，与上报消息头编码一致，唯一
* @param deviceIdEnd * @param moduleMsgCodeList
*/ */
public void setDeviceIdEnd(Long deviceIdEnd){ public void setModuleMsgCodeList(List<String> moduleMsgCodeList){
this.deviceIdEnd = deviceIdEnd; this.moduleMsgCodeList = moduleMsgCodeList;
} }
/**
* 获取 增加 所属设备
* @return deviceIdIncrement
*/
public Long getDeviceIdIncrement(){
return this.deviceIdIncrement;
}
/**
* 设置 增加 所属设备
* @param deviceIdIncrement
*/
public void setDeviceIdIncrement(Long deviceIdIncrement){
this.deviceIdIncrement = deviceIdIncrement;
}
/**
* 获取 所属设备
* @return deviceIdList
*/
public List<Long> getDeviceIdList(){
return this.deviceIdList;
}
/**
* 设置 所属设备
* @param deviceIdList
*/
public void setDeviceIdList(List<Long> deviceIdList){
this.deviceIdList = deviceIdList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -442,95 +326,43 @@ public class DeviceModuleQuery extends DeviceModuleEntity { ...@@ -442,95 +326,43 @@ public class DeviceModuleQuery extends DeviceModuleEntity {
return this; return this;
} }
/**
* 设置 模块名称
* @param moduleId
*/
public DeviceModuleQuery moduleId(Long moduleId){
setModuleId(moduleId);
return this;
}
/**
* 设置 开始 模块名称
* @param moduleIdStart
*/
public DeviceModuleQuery moduleIdStart(Long moduleIdStart){
this.moduleIdStart = moduleIdStart;
return this;
}
/**
* 设置 结束 模块名称
* @param moduleIdEnd
*/
public DeviceModuleQuery moduleIdEnd(Long moduleIdEnd){
this.moduleIdEnd = moduleIdEnd;
return this;
}
/** /**
* 设置 增加 模块名称 * 设置 模块名称
* @param moduleIdIncrement * @param moduleName
*/ */
public DeviceModuleQuery moduleIdIncrement(Long moduleIdIncrement){ public DeviceModuleQuery moduleName(String moduleName){
this.moduleIdIncrement = moduleIdIncrement; setModuleName(moduleName);
return this; return this;
} }
/** /**
* 设置 模块名称 * 设置 模块名称
* @param moduleIdList * @param moduleNameList
*/
public DeviceModuleQuery moduleIdList(List<Long> moduleIdList){
this.moduleIdList = moduleIdList;
return this;
}
/**
* 设置 所属设备
* @param deviceId
*/
public DeviceModuleQuery deviceId(Long deviceId){
setDeviceId(deviceId);
return this;
}
/**
* 设置 开始 所属设备
* @param deviceIdStart
*/ */
public DeviceModuleQuery deviceIdStart(Long deviceIdStart){ public DeviceModuleQuery moduleNameList(List<String> moduleNameList){
this.deviceIdStart = deviceIdStart; this.moduleNameList = moduleNameList;
return this; return this;
} }
/**
* 设置 结束 所属设备
* @param deviceIdEnd
*/
public DeviceModuleQuery deviceIdEnd(Long deviceIdEnd){
this.deviceIdEnd = deviceIdEnd;
return this;
}
/** /**
* 设置 增加 所属设备 * 设置 模块消息编码，与上报消息头编码一致，唯一
* @param deviceIdIncrement * @param moduleMsgCode
*/ */
public DeviceModuleQuery deviceIdIncrement(Long deviceIdIncrement){ public DeviceModuleQuery moduleMsgCode(String moduleMsgCode){
this.deviceIdIncrement = deviceIdIncrement; setModuleMsgCode(moduleMsgCode);
return this; return this;
} }
/** /**
* 设置 所属设备 * 设置 模块消息编码，与上报消息头编码一致，唯一
* @param deviceIdList * @param moduleMsgCodeList
*/ */
public DeviceModuleQuery deviceIdList(List<Long> deviceIdList){ public DeviceModuleQuery moduleMsgCodeList(List<String> moduleMsgCodeList){
this.deviceIdList = deviceIdList; this.moduleMsgCodeList = moduleMsgCodeList;
return this; return this;
} }
/** /**
......
device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceModuleUseEntity.java
View file @ 84e02b55
...@@ -7,52 +7,88 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,52 +7,88 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.device.model.vo.DeviceModuleUseVo; import com.mortals.xhx.module.device.model.vo.DeviceModuleUseVo;
/** /**
* 设备模块使用频率实体对象 * 设备模块使用频率实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-07-01 * @date 2022-07-02
*/ */
public class DeviceModuleUseEntity extends DeviceModuleUseVo { public class DeviceModuleUseEntity extends DeviceModuleUseVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 模块ID * 模块名称
*/ */
private Long moduleId; private String moduleName;
/** /**
* 调用次数 * 模块消息编码
*/ */
private String moduleMsgCode;
/**
* 所属设备
*/
private Long deviceId;
/**
* 调用次数
*/
private Long useNum; private Long useNum;
public DeviceModuleUseEntity(){} public DeviceModuleUseEntity(){}
/** /**
* 获取 模块ID * 获取 模块名称
* @return Long * @return String
*/ */
public Long getModuleId(){ public String getModuleName(){
return moduleId; return moduleName;
}
/**
* 设置 模块名称
* @param moduleName
*/
public void setModuleName(String moduleName){
this.moduleName = moduleName;
}
/**
* 获取 模块消息编码
* @return String
*/
public String getModuleMsgCode(){
return moduleMsgCode;
} }
/** /**
* 设置 模块ID * 设置 模块消息编码
* @param moduleId * @param moduleMsgCode
*/ */
public void setModuleId(Long moduleId){ public void setModuleMsgCode(String moduleMsgCode){
this.moduleId = moduleId; this.moduleMsgCode = moduleMsgCode;
} }
/** /**
* 获取 调用次数 * 获取 所属设备
* @return Long * @return Long
*/ */
public Long getDeviceId(){
return deviceId;
}
/**
* 设置 所属设备
* @param deviceId
*/
public void setDeviceId(Long deviceId){
this.deviceId = deviceId;
}
/**
* 获取 调用次数
* @return Long
*/
public Long getUseNum(){ public Long getUseNum(){
return useNum; return useNum;
} }
/** /**
* 设置 调用次数 * 设置 调用次数
* @param useNum * @param useNum
*/ */
public void setUseNum(Long useNum){ public void setUseNum(Long useNum){
this.useNum = useNum; this.useNum = useNum;
} }
...@@ -62,7 +98,7 @@ public class DeviceModuleUseEntity extends DeviceModuleUseVo { ...@@ -62,7 +98,7 @@ public class DeviceModuleUseEntity extends DeviceModuleUseVo {
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
...@@ -70,7 +106,7 @@ public class DeviceModuleUseEntity extends DeviceModuleUseVo { ...@@ -70,7 +106,7 @@ public class DeviceModuleUseEntity extends DeviceModuleUseVo {
if (obj instanceof DeviceModuleUseEntity) { if (obj instanceof DeviceModuleUseEntity) {
DeviceModuleUseEntity tmp = (DeviceModuleUseEntity) obj; DeviceModuleUseEntity tmp = (DeviceModuleUseEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
...@@ -78,15 +114,21 @@ public class DeviceModuleUseEntity extends DeviceModuleUseVo { ...@@ -78,15 +114,21 @@ public class DeviceModuleUseEntity extends DeviceModuleUseVo {
public String toString(){ public String toString(){
StringBuilder sb = new StringBuilder(""); StringBuilder sb = new StringBuilder("");
sb.append(",moduleId:").append(getModuleId()); sb.append(",moduleName:").append(getModuleName());
sb.append(",moduleMsgCode:").append(getModuleMsgCode());
sb.append(",deviceId:").append(getDeviceId());
sb.append(",useNum:").append(getUseNum()); sb.append(",useNum:").append(getUseNum());
return sb.toString(); return sb.toString();
} }
public void initAttrValue(){ public void initAttrValue(){
this.moduleId = null; this.moduleName = "";
this.moduleMsgCode = "";
this.deviceId = null;
this.useNum = null; this.useNum = null;
} }
} }
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceModuleUseQuery.java
View file @ 84e02b55
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.device.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.device.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.device.model.DeviceModuleUseEntity; import com.mortals.xhx.module.device.model.DeviceModuleUseEntity;
/** /**
* 设备模块使用频率查询对象 * 设备模块使用频率查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-07-01 * @date 2022-07-02
*/ */
public class DeviceModuleUseQuery extends DeviceModuleUseEntity { public class DeviceModuleUseQuery extends DeviceModuleUseEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -21,17 +21,23 @@ public class DeviceModuleUseQuery extends DeviceModuleUseEntity { ...@@ -21,17 +21,23 @@ public class DeviceModuleUseQuery extends DeviceModuleUseEntity {
/** 主键ID，主键，自增长列表 */ /** 主键ID，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 开始 模块ID */ /** 模块名称 */
private Long moduleIdStart; private List<String> moduleNameList;
/** 结束 模块ID */ /** 模块消息编码 */
private Long moduleIdEnd; private List<String> moduleMsgCodeList;
/** 增加 模块ID */ /** 开始 所属设备 */
private Long moduleIdIncrement; private Long deviceIdStart;
/** 模块ID列表 */ /** 结束 所属设备 */
private List <Long> moduleIdList; private Long deviceIdEnd;
/** 增加 所属设备 */
private Long deviceIdIncrement;
/** 所属设备列表 */
private List <Long> deviceIdList;
/** 开始 调用次数 */ /** 开始 调用次数 */
private Long useNumStart; private Long useNumStart;
...@@ -78,535 +84,603 @@ public class DeviceModuleUseQuery extends DeviceModuleUseEntity { ...@@ -78,535 +84,603 @@ public class DeviceModuleUseQuery extends DeviceModuleUseEntity {
public DeviceModuleUseQuery(){} public DeviceModuleUseQuery(){}
/** /**
* 获取 开始 主键ID，主键，自增长 * 获取 开始 主键ID，主键，自增长
* @return idStart * @return idStart
*/ */
public Long getIdStart(){ public Long getIdStart(){
return this.idStart; return this.idStart;
} }
/** /**
* 设置 开始 主键ID，主键，自增长 * 设置 开始 主键ID，主键，自增长
* @param idStart * @param idStart
*/ */
public void setIdStart(Long idStart){ public void setIdStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
} }
/** /**
* 获取 结束 主键ID，主键，自增长 * 获取 结束 主键ID，主键，自增长
* @return $idEnd * @return $idEnd
*/ */
public Long getIdEnd(){ public Long getIdEnd(){
return this.idEnd; return this.idEnd;
} }
/** /**
* 设置 结束 主键ID，主键，自增长 * 设置 结束 主键ID，主键，自增长
* @param idEnd * @param idEnd
*/ */
public void setIdEnd(Long idEnd){ public void setIdEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
} }
/** /**
* 获取 增加 主键ID，主键，自增长 * 获取 增加 主键ID，主键，自增长
* @return idIncrement * @return idIncrement
*/ */
public Long getIdIncrement(){ public Long getIdIncrement(){
return this.idIncrement; return this.idIncrement;
} }
/** /**
* 设置 增加 主键ID，主键，自增长 * 设置 增加 主键ID，主键，自增长
* @param idIncrement * @param idIncrement
*/ */
public void setIdIncrement(Long idIncrement){ public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
} }
/** /**
* 获取 主键ID，主键，自增长 * 获取 主键ID，主键，自增长
* @return idList * @return idList
*/ */
public List<Long> getIdList(){ public List<Long> getIdList(){
return this.idList; return this.idList;
} }
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param idList * @param idList
*/ */
public void setIdList(List<Long> idList){ public void setIdList(List<Long> idList){
this.idList = idList; this.idList = idList;
} }
/** /**
* 获取 开始 模块ID * 获取 模块名称
* @return moduleIdStart * @return moduleNameList
*/ */
public Long getModuleIdStart(){ public List<String> getModuleNameList(){
return this.moduleIdStart; return this.moduleNameList;
} }
/** /**
* 设置 开始 模块ID * 设置 模块名称
* @param moduleIdStart * @param moduleNameList
*/ */
public void setModuleIdStart(Long moduleIdStart){ public void setModuleNameList(List<String> moduleNameList){
this.moduleIdStart = moduleIdStart; this.moduleNameList = moduleNameList;
}
/**
* 获取 模块消息编码
* @return moduleMsgCodeList
*/
public List<String> getModuleMsgCodeList(){
return this.moduleMsgCodeList;
} }
/** /**
* 获取 结束 模块ID * 设置 模块消息编码
* @return $moduleIdEnd * @param moduleMsgCodeList
*/ */
public Long getModuleIdEnd(){ public void setModuleMsgCodeList(List<String> moduleMsgCodeList){
return this.moduleIdEnd; this.moduleMsgCodeList = moduleMsgCodeList;
}
/**
* 获取 开始 所属设备
* @return deviceIdStart
*/
public Long getDeviceIdStart(){
return this.deviceIdStart;
} }
/** /**
* 设置 结束 模块ID * 设置 开始 所属设备
* @param moduleIdEnd * @param deviceIdStart
*/ */
public void setModuleIdEnd(Long moduleIdEnd){ public void setDeviceIdStart(Long deviceIdStart){
this.moduleIdEnd = moduleIdEnd; this.deviceIdStart = deviceIdStart;
} }
/** /**
* 获取 增加 模块ID * 获取 结束 所属设备
* @return moduleIdIncrement * @return $deviceIdEnd
*/ */
public Long getModuleIdIncrement(){ public Long getDeviceIdEnd(){
return this.moduleIdIncrement; return this.deviceIdEnd;
} }
/** /**
* 设置 增加 模块ID * 设置 结束 所属设备
* @param moduleIdIncrement * @param deviceIdEnd
*/ */
public void setModuleIdIncrement(Long moduleIdIncrement){ public void setDeviceIdEnd(Long deviceIdEnd){
this.moduleIdIncrement = moduleIdIncrement; this.deviceIdEnd = deviceIdEnd;
} }
/** /**
* 获取 模块ID * 获取 增加 所属设备
* @return moduleIdList * @return deviceIdIncrement
*/ */
public List<Long> getModuleIdList(){ public Long getDeviceIdIncrement(){
return this.moduleIdList; return this.deviceIdIncrement;
} }
/** /**
* 设置 模块ID * 设置 增加 所属设备
* @param moduleIdList * @param deviceIdIncrement
*/ */
public void setModuleIdList(List<Long> moduleIdList){ public void setDeviceIdIncrement(Long deviceIdIncrement){
this.moduleIdList = moduleIdList; this.deviceIdIncrement = deviceIdIncrement;
} }
/** /**
* 获取 开始 调用次数 * 获取 所属设备
* @return useNumStart * @return deviceIdList
*/ */
public List<Long> getDeviceIdList(){
return this.deviceIdList;
}
/**
* 设置 所属设备
* @param deviceIdList
*/
public void setDeviceIdList(List<Long> deviceIdList){
this.deviceIdList = deviceIdList;
}
/**
* 获取 开始 调用次数
* @return useNumStart
*/
public Long getUseNumStart(){ public Long getUseNumStart(){
return this.useNumStart; return this.useNumStart;
} }
/** /**
* 设置 开始 调用次数 * 设置 开始 调用次数
* @param useNumStart * @param useNumStart
*/ */
public void setUseNumStart(Long useNumStart){ public void setUseNumStart(Long useNumStart){
this.useNumStart = useNumStart; this.useNumStart = useNumStart;
} }
/** /**
* 获取 结束 调用次数 * 获取 结束 调用次数
* @return $useNumEnd * @return $useNumEnd
*/ */
public Long getUseNumEnd(){ public Long getUseNumEnd(){
return this.useNumEnd; return this.useNumEnd;
} }
/** /**
* 设置 结束 调用次数 * 设置 结束 调用次数
* @param useNumEnd * @param useNumEnd
*/ */
public void setUseNumEnd(Long useNumEnd){ public void setUseNumEnd(Long useNumEnd){
this.useNumEnd = useNumEnd; this.useNumEnd = useNumEnd;
} }
/** /**
* 获取 增加 调用次数 * 获取 增加 调用次数
* @return useNumIncrement * @return useNumIncrement
*/ */
public Long getUseNumIncrement(){ public Long getUseNumIncrement(){
return this.useNumIncrement; return this.useNumIncrement;
} }
/** /**
* 设置 增加 调用次数 * 设置 增加 调用次数
* @param useNumIncrement * @param useNumIncrement
*/ */
public void setUseNumIncrement(Long useNumIncrement){ public void setUseNumIncrement(Long useNumIncrement){
this.useNumIncrement = useNumIncrement; this.useNumIncrement = useNumIncrement;
} }
/** /**
* 获取 调用次数 * 获取 调用次数
* @return useNumList * @return useNumList
*/ */
public List<Long> getUseNumList(){ public List<Long> getUseNumList(){
return this.useNumList; return this.useNumList;
} }
/** /**
* 设置 调用次数 * 设置 调用次数
* @param useNumList * @param useNumList
*/ */
public void setUseNumList(List<Long> useNumList){ public void setUseNumList(List<Long> useNumList){
this.useNumList = useNumList; this.useNumList = useNumList;
} }
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
*/ */
public String getCreateTimeStart(){ public String getCreateTimeStart(){
return this.createTimeStart; return this.createTimeStart;
} }
/** /**
* 设置 开始 创建时间 * 设置 开始 创建时间
* @param createTimeStart * @param createTimeStart
*/ */
public void setCreateTimeStart(String createTimeStart){ public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart; this.createTimeStart = createTimeStart;
} }
/** /**
* 获取 结束 创建时间 * 获取 结束 创建时间
* @return createTimeEnd * @return createTimeEnd
*/ */
public String getCreateTimeEnd(){ public String getCreateTimeEnd(){
return this.createTimeEnd; return this.createTimeEnd;
} }
/** /**
* 设置 结束 创建时间 * 设置 结束 创建时间
* @param createTimeEnd * @param createTimeEnd
*/ */
public void setCreateTimeEnd(String createTimeEnd){ public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd; this.createTimeEnd = createTimeEnd;
} }
/** /**
* 获取 开始 更新用户 * 获取 开始 更新用户
* @return updateUserIdStart * @return updateUserIdStart
*/ */
public Long getUpdateUserIdStart(){ public Long getUpdateUserIdStart(){
return this.updateUserIdStart; return this.updateUserIdStart;
} }
/** /**
* 设置 开始 更新用户 * 设置 开始 更新用户
* @param updateUserIdStart * @param updateUserIdStart
*/ */
public void setUpdateUserIdStart(Long updateUserIdStart){ public void setUpdateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart; this.updateUserIdStart = updateUserIdStart;
} }
/** /**
* 获取 结束 更新用户 * 获取 结束 更新用户
* @return $updateUserIdEnd * @return $updateUserIdEnd
*/ */
public Long getUpdateUserIdEnd(){ public Long getUpdateUserIdEnd(){
return this.updateUserIdEnd; return this.updateUserIdEnd;
} }
/** /**
* 设置 结束 更新用户 * 设置 结束 更新用户
* @param updateUserIdEnd * @param updateUserIdEnd
*/ */
public void setUpdateUserIdEnd(Long updateUserIdEnd){ public void setUpdateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd; this.updateUserIdEnd = updateUserIdEnd;
} }
/** /**
* 获取 增加 更新用户 * 获取 增加 更新用户
* @return updateUserIdIncrement * @return updateUserIdIncrement
*/ */
public Long getUpdateUserIdIncrement(){ public Long getUpdateUserIdIncrement(){
return this.updateUserIdIncrement; return this.updateUserIdIncrement;
} }
/** /**
* 设置 增加 更新用户 * 设置 增加 更新用户
* @param updateUserIdIncrement * @param updateUserIdIncrement
*/ */
public void setUpdateUserIdIncrement(Long updateUserIdIncrement){ public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement; this.updateUserIdIncrement = updateUserIdIncrement;
} }
/** /**
* 获取 更新用户 * 获取 更新用户
* @return updateUserIdList * @return updateUserIdList
*/ */
public List<Long> getUpdateUserIdList(){ public List<Long> getUpdateUserIdList(){
return this.updateUserIdList; return this.updateUserIdList;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdList * @param updateUserIdList
*/ */
public void setUpdateUserIdList(List<Long> updateUserIdList){ public void setUpdateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/** /**
* 获取 开始 更新时间 * 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
*/ */
public String getUpdateTimeStart(){ public String getUpdateTimeStart(){
return this.updateTimeStart; return this.updateTimeStart;
} }
/** /**
* 设置 开始 更新时间 * 设置 开始 更新时间
* @param updateTimeStart * @param updateTimeStart
*/ */
public void setUpdateTimeStart(String updateTimeStart){ public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart; this.updateTimeStart = updateTimeStart;
} }
/** /**
* 获取 结束 更新时间 * 获取 结束 更新时间
* @return updateTimeEnd * @return updateTimeEnd
*/ */
public String getUpdateTimeEnd(){ public String getUpdateTimeEnd(){
return this.updateTimeEnd; return this.updateTimeEnd;
} }
/** /**
* 设置 结束 更新时间 * 设置 结束 更新时间
* @param updateTimeEnd * @param updateTimeEnd
*/ */
public void setUpdateTimeEnd(String updateTimeEnd){ public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param id * @param id
*/ */
public DeviceModuleUseQuery id(Long id){ public DeviceModuleUseQuery id(Long id){
setId(id); setId(id);
return this; return this;
} }
/** /**
* 设置 开始 主键ID，主键，自增长 * 设置 开始 主键ID，主键，自增长
* @param idStart * @param idStart
*/ */
public DeviceModuleUseQuery idStart(Long idStart){ public DeviceModuleUseQuery idStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
return this; return this;
} }
/** /**
* 设置 结束 主键ID，主键，自增长 * 设置 结束 主键ID，主键，自增长
* @param idEnd * @param idEnd
*/ */
public DeviceModuleUseQuery idEnd(Long idEnd){ public DeviceModuleUseQuery idEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
return this; return this;
} }
/** /**
* 设置 增加 主键ID，主键，自增长 * 设置 增加 主键ID，主键，自增长
* @param idIncrement * @param idIncrement
*/ */
public DeviceModuleUseQuery idIncrement(Long idIncrement){ public DeviceModuleUseQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
return this; return this;
} }
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param idList * @param idList
*/ */
public DeviceModuleUseQuery idList(List<Long> idList){ public DeviceModuleUseQuery idList(List<Long> idList){
this.idList = idList; this.idList = idList;
return this; return this;
} }
/**
* 设置 模块名称
* @param moduleName
*/
public DeviceModuleUseQuery moduleName(String moduleName){
setModuleName(moduleName);
return this;
}
/**
* 设置 模块名称
* @param moduleNameList
*/
public DeviceModuleUseQuery moduleNameList(List<String> moduleNameList){
this.moduleNameList = moduleNameList;
return this;
}
/** /**
* 设置 模块ID * 设置 模块消息编码
* @param moduleId * @param moduleMsgCode
*/ */
public DeviceModuleUseQuery moduleId(Long moduleId){ public DeviceModuleUseQuery moduleMsgCode(String moduleMsgCode){
setModuleId(moduleId); setModuleMsgCode(moduleMsgCode);
return this; return this;
} }
/** /**
* 设置 开始 模块ID * 设置 模块消息编码
* @param moduleIdStart * @param moduleMsgCodeList
*/ */
public DeviceModuleUseQuery moduleIdStart(Long moduleIdStart){ public DeviceModuleUseQuery moduleMsgCodeList(List<String> moduleMsgCodeList){
this.moduleIdStart = moduleIdStart; this.moduleMsgCodeList = moduleMsgCodeList;
return this; return this;
} }
/** /**
* 设置 结束 模块ID * 设置 所属设备
* @param moduleIdEnd * @param deviceId
*/ */
public DeviceModuleUseQuery moduleIdEnd(Long moduleIdEnd){ public DeviceModuleUseQuery deviceId(Long deviceId){
this.moduleIdEnd = moduleIdEnd; setDeviceId(deviceId);
return this; return this;
} }
/** /**
* 设置 增加 模块ID * 设置 开始 所属设备
* @param moduleIdIncrement * @param deviceIdStart
*/ */
public DeviceModuleUseQuery moduleIdIncrement(Long moduleIdIncrement){ public DeviceModuleUseQuery deviceIdStart(Long deviceIdStart){
this.moduleIdIncrement = moduleIdIncrement; this.deviceIdStart = deviceIdStart;
return this; return this;
} }
/** /**
* 设置 模块ID * 设置 结束 所属设备
* @param moduleIdList * @param deviceIdEnd
*/ */
public DeviceModuleUseQuery moduleIdList(List<Long> moduleIdList){ public DeviceModuleUseQuery deviceIdEnd(Long deviceIdEnd){
this.moduleIdList = moduleIdList; this.deviceIdEnd = deviceIdEnd;
return this; return this;
} }
/** /**
* 设置 调用次数 * 设置 增加 所属设备
* @param useNum * @param deviceIdIncrement
*/ */
public DeviceModuleUseQuery deviceIdIncrement(Long deviceIdIncrement){
this.deviceIdIncrement = deviceIdIncrement;
return this;
}
/**
* 设置 所属设备
* @param deviceIdList
*/
public DeviceModuleUseQuery deviceIdList(List<Long> deviceIdList){
this.deviceIdList = deviceIdList;
return this;
}
/**
* 设置 调用次数
* @param useNum
*/
public DeviceModuleUseQuery useNum(Long useNum){ public DeviceModuleUseQuery useNum(Long useNum){
setUseNum(useNum); setUseNum(useNum);
return this; return this;
} }
/** /**
* 设置 开始 调用次数 * 设置 开始 调用次数
* @param useNumStart * @param useNumStart
*/ */
public DeviceModuleUseQuery useNumStart(Long useNumStart){ public DeviceModuleUseQuery useNumStart(Long useNumStart){
this.useNumStart = useNumStart; this.useNumStart = useNumStart;
return this; return this;
} }
/** /**
* 设置 结束 调用次数 * 设置 结束 调用次数
* @param useNumEnd * @param useNumEnd
*/ */
public DeviceModuleUseQuery useNumEnd(Long useNumEnd){ public DeviceModuleUseQuery useNumEnd(Long useNumEnd){
this.useNumEnd = useNumEnd; this.useNumEnd = useNumEnd;
return this; return this;
} }
/** /**
* 设置 增加 调用次数 * 设置 增加 调用次数
* @param useNumIncrement * @param useNumIncrement
*/ */
public DeviceModuleUseQuery useNumIncrement(Long useNumIncrement){ public DeviceModuleUseQuery useNumIncrement(Long useNumIncrement){
this.useNumIncrement = useNumIncrement; this.useNumIncrement = useNumIncrement;
return this; return this;
} }
/** /**
* 设置 调用次数 * 设置 调用次数
* @param useNumList * @param useNumList
*/ */
public DeviceModuleUseQuery useNumList(List<Long> useNumList){ public DeviceModuleUseQuery useNumList(List<Long> useNumList){
this.useNumList = useNumList; this.useNumList = useNumList;
return this; return this;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserId * @param updateUserId
*/ */
public DeviceModuleUseQuery updateUserId(Long updateUserId){ public DeviceModuleUseQuery updateUserId(Long updateUserId){
setUpdateUserId(updateUserId); setUpdateUserId(updateUserId);
return this; return this;
} }
/** /**
* 设置 开始 更新用户 * 设置 开始 更新用户
* @param updateUserIdStart * @param updateUserIdStart
*/ */
public DeviceModuleUseQuery updateUserIdStart(Long updateUserIdStart){ public DeviceModuleUseQuery updateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart; this.updateUserIdStart = updateUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 更新用户 * 设置 结束 更新用户
* @param updateUserIdEnd * @param updateUserIdEnd
*/ */
public DeviceModuleUseQuery updateUserIdEnd(Long updateUserIdEnd){ public DeviceModuleUseQuery updateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd; this.updateUserIdEnd = updateUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 更新用户 * 设置 增加 更新用户
* @param updateUserIdIncrement * @param updateUserIdIncrement
*/ */
public DeviceModuleUseQuery updateUserIdIncrement(Long updateUserIdIncrement){ public DeviceModuleUseQuery updateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement; this.updateUserIdIncrement = updateUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdList * @param updateUserIdList
*/ */
public DeviceModuleUseQuery updateUserIdList(List<Long> updateUserIdList){ public DeviceModuleUseQuery updateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
return this; return this;
} }
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
*/ */
public List<DeviceModuleUseQuery> getOrConditionList(){ public List<DeviceModuleUseQuery> getOrConditionList(){
return this.orConditionList; return this.orConditionList;
} }
/** /**
* 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList * @param orConditionList
*/ */
public void setOrConditionList(List<DeviceModuleUseQuery> orConditionList){ public void setOrConditionList(List<DeviceModuleUseQuery> orConditionList){
this.orConditionList = orConditionList; this.orConditionList = orConditionList;
} }
/** /**
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList * @return andConditionList
*/ */
public List<DeviceModuleUseQuery> getAndConditionList(){ public List<DeviceModuleUseQuery> getAndConditionList(){
return this.andConditionList; return this.andConditionList;
} }
/** /**
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList * @param andConditionList
*/ */
public void setAndConditionList(List<DeviceModuleUseQuery> andConditionList){ public void setAndConditionList(List<DeviceModuleUseQuery> andConditionList){
this.andConditionList = andConditionList; this.andConditionList = andConditionList;
} }
......
device-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceAlarmInfoVo.java
View file @ 84e02b55
package com.mortals.xhx.module.device.model.vo; package com.mortals.xhx.module.device.model.vo;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.device.model.DeviceAlarmInfoEntity; import com.mortals.xhx.module.device.model.DeviceAlarmInfoEntity;
import lombok.Data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
...@@ -9,6 +11,12 @@ import java.util.List; ...@@ -9,6 +11,12 @@ import java.util.List;
* @author zxfei * @author zxfei
* @date 2022-07-01 * @date 2022-07-01
*/ */
@Data
public class DeviceAlarmInfoVo extends BaseEntityLong { public class DeviceAlarmInfoVo extends BaseEntityLong {
/** 开始 告警时间 */
private String alarmTimeStart;
/** 结束 告警时间 */
private String alarmTimeEnd;
} }
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceModuleUseVo.java
View file @ 84e02b55
...@@ -7,7 +7,7 @@ import java.util.List; ...@@ -7,7 +7,7 @@ import java.util.List;
* 设备模块使用频率视图对象 * 设备模块使用频率视图对象
* *
* @author zxfei * @author zxfei
* @date 2022-07-01 * @date 2022-07-02
*/ */
public class DeviceModuleUseVo extends BaseEntityLong { public class DeviceModuleUseVo extends BaseEntityLong {
......
device-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceModuleVo.java
View file @ 84e02b55
...@@ -7,7 +7,7 @@ import java.util.List; ...@@ -7,7 +7,7 @@ import java.util.List;
* 设备模块信息视图对象 * 设备模块信息视图对象
* *
* @author zxfei * @author zxfei
* @date 2022-07-01 * @date 2022-07-02
*/ */
public class DeviceModuleVo extends BaseEntityLong { public class DeviceModuleVo extends BaseEntityLong {
......
device-manager/src/main/java/com/mortals/xhx/module/device/service/DeviceModuleService.java
View file @ 84e02b55
...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.device.model.DeviceModuleEntity; ...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.device.model.DeviceModuleEntity;
* 设备模块信息 service接口 * 设备模块信息 service接口
* *
* @author zxfei * @author zxfei
* @date 2022-06-27 * @date 2022-07-02
*/ */
public interface DeviceModuleService extends ICRUDService<DeviceModuleEntity,Long>{ public interface DeviceModuleService extends ICRUDService<DeviceModuleEntity,Long>{
......
device-manager/src/main/java/com/mortals/xhx/module/device/service/DeviceModuleUseService.java
View file @ 84e02b55
...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.device.model.DeviceModuleUseEntity; ...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.device.model.DeviceModuleUseEntity;
* 设备模块使用频率 service接口 * 设备模块使用频率 service接口
* *
* @author zxfei * @author zxfei
* @date 2022-06-27 * @date 2022-07-02
*/ */
public interface DeviceModuleUseService extends ICRUDService<DeviceModuleUseEntity,Long>{ public interface DeviceModuleUseService extends ICRUDService<DeviceModuleUseEntity,Long>{
......
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceModuleServiceImpl.java
View file @ 84e02b55
...@@ -9,7 +9,7 @@ import com.mortals.xhx.module.device.service.DeviceModuleService; ...@@ -9,7 +9,7 @@ import com.mortals.xhx.module.device.service.DeviceModuleService;
* 设备模块信息 service实现 * 设备模块信息 service实现
* *
* @author zxfei * @author zxfei
* @date 2022-06-27 * @date 2022-07-02
*/ */
@Service("deviceModuleService") @Service("deviceModuleService")
public class DeviceModuleServiceImpl extends AbstractCRUDServiceImpl<DeviceModuleDao, DeviceModuleEntity, Long> implements DeviceModuleService { public class DeviceModuleServiceImpl extends AbstractCRUDServiceImpl<DeviceModuleDao, DeviceModuleEntity, Long> implements DeviceModuleService {
......
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceModuleUseServiceImpl.java
View file @ 84e02b55
...@@ -9,7 +9,7 @@ import com.mortals.xhx.module.device.service.DeviceModuleUseService; ...@@ -9,7 +9,7 @@ import com.mortals.xhx.module.device.service.DeviceModuleUseService;
* 设备模块使用频率 service实现 * 设备模块使用频率 service实现
* *
* @author zxfei * @author zxfei
* @date 2022-06-27 * @date 2022-07-02
*/ */
@Service("deviceModuleUseService") @Service("deviceModuleUseService")
public class DeviceModuleUseServiceImpl extends AbstractCRUDServiceImpl<DeviceModuleUseDao, DeviceModuleUseEntity, Long> implements DeviceModuleUseService { public class DeviceModuleUseServiceImpl extends AbstractCRUDServiceImpl<DeviceModuleUseDao, DeviceModuleUseEntity, Long> implements DeviceModuleUseService {
......
device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceAlarmInfoController.java
View file @ 84e02b55
...@@ -4,35 +4,41 @@ import com.mortals.framework.model.Context; ...@@ -4,35 +4,41 @@ import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.module.device.model.DeviceAlarmInfoEntity; import com.mortals.xhx.module.device.model.DeviceAlarmInfoEntity;
import com.mortals.xhx.module.device.model.DeviceQuery;
import com.mortals.xhx.module.device.service.DeviceAlarmInfoService; import com.mortals.xhx.module.device.service.DeviceAlarmInfoService;
import com.mortals.xhx.module.device.service.DeviceService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
/** /**
* * 设备告警日志
* 设备告警日志 *
* * @author zxfei
* @author zxfei * @date 2022-06-27
* @date 2022-06-27 */
*/
@RestController @RestController
@RequestMapping("device/alarm/info") @RequestMapping("device/alarm/info")
public class DeviceAlarmInfoController extends BaseCRUDJsonBodyMappingController<DeviceAlarmInfoService,DeviceAlarmInfoEntity,Long> { public class DeviceAlarmInfoController extends BaseCRUDJsonBodyMappingController<DeviceAlarmInfoService, DeviceAlarmInfoEntity, Long> {
@Autowired @Autowired
private ParamService paramService; private ParamService paramService;
@Autowired
private DeviceService deviceService;
public DeviceAlarmInfoController(){ public DeviceAlarmInfoController() {
super.setModuleDesc( "设备告警日志"); super.setModuleDesc("设备告警日志");
} }
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "alarmType", paramService.getParamBySecondOrganize("DeviceAlarmInfo","alarmType")); this.addDict(model, "alarmType", paramService.getParamBySecondOrganize("DeviceAlarmInfo", "alarmType"));
this.addDict(model, "alarmLevel", paramService.getParamBySecondOrganize("DeviceAlarmInfo","alarmLevel")); this.addDict(model, "alarmLevel", paramService.getParamBySecondOrganize("DeviceAlarmInfo", "alarmLevel"));
this.addDict(model, "alarmStatus", paramService.getParamBySecondOrganize("DeviceAlarmInfo","alarmStatus")); this.addDict(model, "alarmStatus", paramService.getParamBySecondOrganize("DeviceAlarmInfo", "alarmStatus"));
this.addDict(model, "alarmDevice", deviceService.find(new DeviceQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeviceName())));
super.init(model, context); super.init(model, context);
} }
......
device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceModuleController.java
View file @ 84e02b55
package com.mortals.xhx.module.device.web; package com.mortals.xhx.module.device.web;
import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.module.device.model.DeviceModuleEntity;
import com.mortals.xhx.module.device.service.DeviceModuleService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; 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.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 * @author zxfei
* @date 2022-06-27 * @date 2022-07-02
*/ */
@RestController @RestController
@RequestMapping("device/module") @RequestMapping("device/module")
......
device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceModuleUseController.java
View file @ 84e02b55
package com.mortals.xhx.module.device.web; package com.mortals.xhx.module.device.web;
import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.module.device.model.DeviceModuleUseEntity;
import com.mortals.xhx.module.device.service.DeviceModuleUseService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; 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.DeviceModuleUseEntity;
import com.mortals.xhx.module.device.service.DeviceModuleUseService;
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.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 * @author zxfei
* @date 2022-06-27 * @date 2022-07-02
*/ */
@RestController @RestController
@RequestMapping("device/module/use") @RequestMapping("device/module/use")
......
device-manager/src/main/resources/sqlmap/module/device/DeviceLogMapper.xml
View file @ 84e02b55
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.device.dao.ibatis.DeviceLogDaoImpl"> <mapper namespace="com.mortals.xhx.module.device.dao.ibatis.DeviceLogDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="DeviceLogEntity" id="DeviceLogEntity-Map"> <resultMap type="DeviceLogEntity" id="DeviceLogEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="traceID" column="traceID" /> <result property="traceID" column="traceID" />
<result property="deviceId" column="deviceId" /> <result property="deviceId" column="deviceId" />
<result property="deviceNum" column="deviceNum" /> <result property="deviceCode" column="deviceCode" />
<result property="deviceName" column="deviceName" /> <result property="deviceName" column="deviceName" />
<result property="logType" column="logType" /> <result property="messageHead" column="messageHead" />
<result property="content" column="content" /> <result property="logType" column="logType" />
<result property="createUserId" column="createUserId" /> <result property="content" column="content" />
<result property="createTime" column="createTime" /> <result property="createUserId" column="createUserId" />
<result property="updateUserId" column="updateUserId" /> <result property="createTime" column="createTime" />
<result property="updateTime" column="updateTime" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
<sql id="_columns"> <sql id="_columns">
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id, a.id,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('traceID') or colPickMode == 1 and data.containsKey('traceID')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('traceID') or colPickMode == 1 and data.containsKey('traceID')))">
a.traceID, a.traceID,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceId') or colPickMode == 1 and data.containsKey('deviceId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceId') or colPickMode == 1 and data.containsKey('deviceId')))">
a.deviceId, a.deviceId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceNum') or colPickMode == 1 and data.containsKey('deviceNum')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceCode') or colPickMode == 1 and data.containsKey('deviceCode')))">
a.deviceNum, a.deviceCode,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceName') or colPickMode == 1 and data.containsKey('deviceName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceName') or colPickMode == 1 and data.containsKey('deviceName')))">
a.deviceName, a.deviceName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('logType') or colPickMode == 1 and data.containsKey('logType')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('messageHead') or colPickMode == 1 and data.containsKey('messageHead')))">
a.logType, a.messageHead,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('content') or colPickMode == 1 and data.containsKey('content')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('logType') or colPickMode == 1 and data.containsKey('logType')))">
a.content, a.logType,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('content') or colPickMode == 1 and data.containsKey('content')))">
a.createUserId, a.content,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createTime, a.createUserId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.updateUserId, a.createTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
a.updateTime, a.updateUserId,
</if> </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> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="DeviceLogEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="DeviceLogEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_device_log insert into mortals_xhx_device_log
(traceID,deviceId,deviceNum,deviceName,logType,content,createUserId,createTime,updateUserId,updateTime) (traceID,deviceId,deviceCode,deviceName,messageHead,logType,content,createUserId,createTime,updateUserId,updateTime)
VALUES VALUES
(#{traceID},#{deviceId},#{deviceNum},#{deviceName},#{logType},#{content},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{traceID},#{deviceId},#{deviceCode},#{deviceName},#{messageHead},#{logType},#{content},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_device_log insert into mortals_xhx_device_log
(traceID,deviceId,deviceNum,deviceName,logType,content,createUserId,createTime,updateUserId,updateTime) (traceID,deviceId,deviceCode,deviceName,messageHead,logType,content,createUserId,createTime,updateUserId,updateTime)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.traceID},#{item.deviceId},#{item.deviceNum},#{item.deviceName},#{item.logType},#{item.content},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.traceID},#{item.deviceId},#{item.deviceCode},#{item.deviceName},#{item.messageHead},#{item.logType},#{item.content},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach> </foreach>
</insert> </insert>
...@@ -91,12 +95,15 @@ ...@@ -91,12 +95,15 @@
<if test="(colPickMode==0 and data.containsKey('deviceIdIncrement')) or (colPickMode==1 and !data.containsKey('deviceIdIncrement'))"> <if test="(colPickMode==0 and data.containsKey('deviceIdIncrement')) or (colPickMode==1 and !data.containsKey('deviceIdIncrement'))">
a.deviceId=ifnull(a.deviceId,0) + #{data.deviceIdIncrement}, a.deviceId=ifnull(a.deviceId,0) + #{data.deviceIdIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('deviceNum')) or (colPickMode==1 and !data.containsKey('deviceNum'))"> <if test="(colPickMode==0 and data.containsKey('deviceCode')) or (colPickMode==1 and !data.containsKey('deviceCode'))">
a.deviceNum=#{data.deviceNum}, a.deviceCode=#{data.deviceCode},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('deviceName')) or (colPickMode==1 and !data.containsKey('deviceName'))"> <if test="(colPickMode==0 and data.containsKey('deviceName')) or (colPickMode==1 and !data.containsKey('deviceName'))">
a.deviceName=#{data.deviceName}, a.deviceName=#{data.deviceName},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('messageHead')) or (colPickMode==1 and !data.containsKey('messageHead'))">
a.messageHead=#{data.messageHead},
</if>
<if test="(colPickMode==0 and data.containsKey('logType')) or (colPickMode==1 and !data.containsKey('logType'))"> <if test="(colPickMode==0 and data.containsKey('logType')) or (colPickMode==1 and !data.containsKey('logType'))">
a.logType=#{data.logType}, a.logType=#{data.logType},
</if> </if>
...@@ -136,96 +143,103 @@ ...@@ -136,96 +143,103 @@
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_xhx_device_log as a update mortals_xhx_device_log as a
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<trim prefix="traceID=(case" suffix="ELSE traceID end),"> <trim prefix="traceID=(case" suffix="ELSE traceID end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('traceID')) or (colPickMode==1 and !item.containsKey('traceID'))"> <if test="(colPickMode==0 and item.containsKey('traceID')) or (colPickMode==1 and !item.containsKey('traceID'))">
when a.id=#{item.id} then #{item.traceID} when a.id=#{item.id} then #{item.traceID}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deviceId=(case" suffix="ELSE deviceId end),"> <trim prefix="deviceId=(case" suffix="ELSE deviceId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('deviceId')) or (colPickMode==1 and !item.containsKey('deviceId'))"> <when test="(colPickMode==0 and item.containsKey('deviceId')) or (colPickMode==1 and !item.containsKey('deviceId'))">
when a.id=#{item.id} then #{item.deviceId} when a.id=#{item.id} then #{item.deviceId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('deviceIdIncrement')) or (colPickMode==1 and !item.containsKey('deviceIdIncrement'))"> <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 a.id=#{item.id} then ifnull(a.deviceId,0) + #{item.deviceIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deviceNum=(case" suffix="ELSE deviceNum end),"> <trim prefix="deviceCode=(case" suffix="ELSE deviceCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('deviceNum')) or (colPickMode==1 and !item.containsKey('deviceNum'))"> <if test="(colPickMode==0 and item.containsKey('deviceCode')) or (colPickMode==1 and !item.containsKey('deviceCode'))">
when a.id=#{item.id} then #{item.deviceNum} when a.id=#{item.id} then #{item.deviceCode}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deviceName=(case" suffix="ELSE deviceName end),"> <trim prefix="deviceName=(case" suffix="ELSE deviceName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('deviceName')) or (colPickMode==1 and !item.containsKey('deviceName'))"> <if test="(colPickMode==0 and item.containsKey('deviceName')) or (colPickMode==1 and !item.containsKey('deviceName'))">
when a.id=#{item.id} then #{item.deviceName} when a.id=#{item.id} then #{item.deviceName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="logType=(case" suffix="ELSE logType end),"> <trim prefix="messageHead=(case" suffix="ELSE messageHead end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <if test="(colPickMode==0 and item.containsKey('messageHead')) or (colPickMode==1 and !item.containsKey('messageHead'))">
<when test="(colPickMode==0 and item.containsKey('logType')) or (colPickMode==1 and !item.containsKey('logType'))"> when a.id=#{item.id} then #{item.messageHead}
when a.id=#{item.id} then #{item.logType} </if>
</when> </foreach>
<when test="(colPickMode==0 and item.containsKey('logTypeIncrement')) or (colPickMode==1 and !item.containsKey('logTypeIncrement'))"> </trim>
when a.id=#{item.id} then ifnull(a.logType,0) + #{item.logTypeIncrement} <trim prefix="logType=(case" suffix="ELSE logType end),">
</when> <foreach collection="data.dataList" item="item" index="index" separator="" >
</choose> <choose>
</foreach> <when test="(colPickMode==0 and item.containsKey('logType')) or (colPickMode==1 and !item.containsKey('logType'))">
</trim> when a.id=#{item.id} then #{item.logType}
<trim prefix="content=(case" suffix="ELSE content end),"> </when>
<foreach collection="data.dataList" item="item" index="index" separator="" > <when test="(colPickMode==0 and item.containsKey('logTypeIncrement')) or (colPickMode==1 and !item.containsKey('logTypeIncrement'))">
<if test="(colPickMode==0 and item.containsKey('content')) or (colPickMode==1 and !item.containsKey('content'))"> when a.id=#{item.id} then ifnull(a.logType,0) + #{item.logTypeIncrement}
when a.id=#{item.id} then #{item.content} </when>
</if> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),"> <trim prefix="content=(case" suffix="ELSE content end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <if test="(colPickMode==0 and item.containsKey('content')) or (colPickMode==1 and !item.containsKey('content'))">
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))"> when a.id=#{item.id} then #{item.content}
when a.id=#{item.id} then #{item.createUserId} </if>
</when> </foreach>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))"> </trim>
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement} <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
</when> <foreach collection="data.dataList" item="item" index="index" separator="" >
</choose> <choose>
</foreach> <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
</trim> when a.id=#{item.id} then #{item.createUserId}
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> </when>
<foreach collection="data.dataList" item="item" index="index" separator="" > <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
when a.id=#{item.id} then #{item.createTime} </when>
</if> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),"> <trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
<when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))"> when a.id=#{item.id} then #{item.createTime}
when a.id=#{item.id} then #{item.updateUserId} </if>
</when> </foreach>
<when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))"> </trim>
when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement} <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
</when> <foreach collection="data.dataList" item="item" index="index" separator="" >
</choose> <choose>
</foreach> <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
</trim> when a.id=#{item.id} then #{item.updateUserId}
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),"> </when>
<foreach collection="data.dataList" item="item" index="index" separator="" > <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))"> when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
when a.id=#{item.id} then #{item.updateTime} </when>
</if> </choose>
</foreach> </foreach>
</trim> </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> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -327,269 +341,289 @@ ...@@ -327,269 +341,289 @@
${_conditionType_} a.id=#{${_conditionParam_}.id} ${_conditionType_} a.id=#{${_conditionParam_}.id}
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('id')"> <if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null "> <if test="conditionParamRef.id != null ">
${_conditionType_} a.id = #{${_conditionParam_}.id} ${_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>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null"> <if test="conditionParamRef.id == null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd} ${_conditionType_} a.id is null
</if> </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('traceID')"> <if test="conditionParamRef.containsKey('traceID')">
<if test="conditionParamRef.traceID != null and conditionParamRef.traceID != ''"> <if test="conditionParamRef.traceID != null and conditionParamRef.traceID != ''">
${_conditionType_} a.traceID like #{${_conditionParam_}.traceID} ${_conditionType_} a.traceID like #{${_conditionParam_}.traceID}
</if>
<if test="conditionParamRef.traceID == null">
${_conditionType_} a.traceID is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('traceIDList')"> <if test="conditionParamRef.traceID == null">
${_conditionType_} a.traceID in ${_conditionType_} a.traceID is null
<foreach collection="conditionParamRef.traceIDList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deviceId')"> </if>
<if test="conditionParamRef.deviceId != null "> <if test="conditionParamRef.containsKey('traceIDList')">
${_conditionType_} a.deviceId = #{${_conditionParam_}.deviceId} ${_conditionType_} a.traceID in
</if> <foreach collection="conditionParamRef.traceIDList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.deviceId == null"> #{item}
${_conditionType_} a.deviceId is null </foreach>
</if> </if>
</if> <if test="conditionParamRef.containsKey('deviceId')">
<if test="conditionParamRef.containsKey('deviceIdList')"> <if test="conditionParamRef.deviceId != null ">
${_conditionType_} a.deviceId in ${_conditionType_} a.deviceId = #{${_conditionParam_}.deviceId}
<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>
<if test="conditionParamRef.containsKey('deviceIdEnd') and conditionParamRef.deviceIdEnd != null"> <if test="conditionParamRef.deviceId == null">
${_conditionType_} a.deviceId <![CDATA[ <= ]]> #{${_conditionParam_}.deviceIdEnd} ${_conditionType_} a.deviceId is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('deviceIdList')">
${_conditionType_} a.deviceId in
<foreach collection="conditionParamRef.deviceIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceIdStart') and conditionParamRef.deviceIdStart != null">
${_conditionType_} a.deviceId <![CDATA[ >= ]]> #{${_conditionParam_}.deviceIdStart}
</if>
<if test="conditionParamRef.containsKey('deviceIdEnd') and conditionParamRef.deviceIdEnd != null">
${_conditionType_} a.deviceId <![CDATA[ <= ]]> #{${_conditionParam_}.deviceIdEnd}
</if>
<if test="conditionParamRef.containsKey('deviceNum')"> <if test="conditionParamRef.containsKey('deviceCode')">
<if test="conditionParamRef.deviceNum != null and conditionParamRef.deviceNum != ''"> <if test="conditionParamRef.deviceCode != null and conditionParamRef.deviceCode != ''">
${_conditionType_} a.deviceNum like #{${_conditionParam_}.deviceNum} ${_conditionType_} a.deviceCode like #{${_conditionParam_}.deviceCode}
</if>
<if test="conditionParamRef.deviceNum == null">
${_conditionType_} a.deviceNum is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceNumList')"> <if test="conditionParamRef.deviceCode == null">
${_conditionType_} a.deviceNum in ${_conditionType_} a.deviceCode is null
<foreach collection="conditionParamRef.deviceNumList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('deviceCodeList')">
${_conditionType_} a.deviceCode in
<foreach collection="conditionParamRef.deviceCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceName')"> <if test="conditionParamRef.containsKey('deviceName')">
<if test="conditionParamRef.deviceName != null and conditionParamRef.deviceName != ''"> <if test="conditionParamRef.deviceName != null and conditionParamRef.deviceName != ''">
${_conditionType_} a.deviceName like #{${_conditionParam_}.deviceName} ${_conditionType_} a.deviceName like #{${_conditionParam_}.deviceName}
</if>
<if test="conditionParamRef.deviceName == null">
${_conditionType_} a.deviceName is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceNameList')"> <if test="conditionParamRef.deviceName == null">
${_conditionType_} a.deviceName in ${_conditionType_} a.deviceName is null
<foreach collection="conditionParamRef.deviceNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('logType')"> </if>
<if test="conditionParamRef.logType != null "> <if test="conditionParamRef.containsKey('deviceNameList')">
${_conditionType_} a.logType = #{${_conditionParam_}.logType} ${_conditionType_} a.deviceName in
</if> <foreach collection="conditionParamRef.deviceNameList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.logType == null"> #{item}
${_conditionType_} a.logType is null </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('messageHead')">
<if test="conditionParamRef.messageHead != null and conditionParamRef.messageHead != ''">
${_conditionType_} a.messageHead like #{${_conditionParam_}.messageHead}
</if> </if>
<if test="conditionParamRef.containsKey('logTypeList')"> <if test="conditionParamRef.messageHead == null">
${_conditionType_} a.logType in ${_conditionType_} a.messageHead is null
<foreach collection="conditionParamRef.logTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('logTypeStart') and conditionParamRef.logTypeStart != null"> </if>
${_conditionType_} a.logType <![CDATA[ >= ]]> #{${_conditionParam_}.logTypeStart} <if test="conditionParamRef.containsKey('messageHeadList')">
${_conditionType_} a.messageHead in
<foreach collection="conditionParamRef.messageHeadList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('logType')">
<if test="conditionParamRef.logType != null ">
${_conditionType_} a.logType = #{${_conditionParam_}.logType}
</if> </if>
<if test="conditionParamRef.containsKey('logTypeEnd') and conditionParamRef.logTypeEnd != null"> <if test="conditionParamRef.logType == null">
${_conditionType_} a.logType <![CDATA[ <= ]]> #{${_conditionParam_}.logTypeEnd} ${_conditionType_} a.logType is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('logTypeList')">
${_conditionType_} a.logType in
<foreach collection="conditionParamRef.logTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('logTypeStart') and conditionParamRef.logTypeStart != null">
${_conditionType_} a.logType <![CDATA[ >= ]]> #{${_conditionParam_}.logTypeStart}
</if>
<if test="conditionParamRef.containsKey('logTypeEnd') and conditionParamRef.logTypeEnd != null">
${_conditionType_} a.logType <![CDATA[ <= ]]> #{${_conditionParam_}.logTypeEnd}
</if>
<if test="conditionParamRef.containsKey('content')"> <if test="conditionParamRef.containsKey('content')">
<if test="conditionParamRef.content != null and conditionParamRef.content != ''"> <if test="conditionParamRef.content != null and conditionParamRef.content != ''">
${_conditionType_} a.content like #{${_conditionParam_}.content} ${_conditionType_} a.content like #{${_conditionParam_}.content}
</if>
<if test="conditionParamRef.content == null">
${_conditionType_} a.content is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('contentList')"> <if test="conditionParamRef.content == null">
${_conditionType_} a.content in ${_conditionType_} a.content is null
<foreach collection="conditionParamRef.contentList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserId')"> </if>
<if test="conditionParamRef.createUserId != null "> <if test="conditionParamRef.containsKey('contentList')">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId} ${_conditionType_} a.content in
</if> <foreach collection="conditionParamRef.contentList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.createUserId == null"> #{item}
${_conditionType_} a.createUserId is null </foreach>
</if> </if>
</if> <if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
<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>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null"> <if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd} ${_conditionType_} a.createUserId is null
</if> </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.containsKey('createTime')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime} ${_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>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.createTime == null">
${_conditionType_} a.updateUserId in ${_conditionType_} a.createTime is null
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> </if>
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} <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>
<if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null"> <if test="conditionParamRef.updateUserId == null">
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd} ${_conditionType_} a.updateUserId is null
</if> </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.containsKey('updateTime')">
<if test="conditionParamRef.updateTime != null "> <if test="conditionParamRef.updateTime != null ">
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime} ${_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>
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.updateTime == null">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime is null
</if> </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>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
order by order by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind} ${item.colName} ${item.sortKind}
</foreach> </foreach>
</trim> </trim>
</if> </if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()"> <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by order by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
a.id a.id
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if> <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('traceID')"> <if test="orderCol.containsKey('traceID')">
a.traceID a.traceID
<if test='orderCol.traceID != null and "DESC".equalsIgnoreCase(orderCol.traceID)'>DESC</if> <if test='orderCol.traceID != null and "DESC".equalsIgnoreCase(orderCol.traceID)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('deviceId')"> <if test="orderCol.containsKey('deviceId')">
a.deviceId a.deviceId
<if test='orderCol.deviceId != null and "DESC".equalsIgnoreCase(orderCol.deviceId)'>DESC</if> <if test='orderCol.deviceId != null and "DESC".equalsIgnoreCase(orderCol.deviceId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('deviceNum')"> <if test="orderCol.containsKey('deviceCode')">
a.deviceNum a.deviceCode
<if test='orderCol.deviceNum != null and "DESC".equalsIgnoreCase(orderCol.deviceNum)'>DESC</if> <if test='orderCol.deviceCode != null and "DESC".equalsIgnoreCase(orderCol.deviceCode)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('deviceName')"> <if test="orderCol.containsKey('deviceName')">
a.deviceName a.deviceName
<if test='orderCol.deviceName != null and "DESC".equalsIgnoreCase(orderCol.deviceName)'>DESC</if> <if test='orderCol.deviceName != null and "DESC".equalsIgnoreCase(orderCol.deviceName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('logType')"> <if test="orderCol.containsKey('messageHead')">
a.logType a.messageHead
<if test='orderCol.logType != null and "DESC".equalsIgnoreCase(orderCol.logType)'>DESC</if> <if test='orderCol.messageHead != null and "DESC".equalsIgnoreCase(orderCol.messageHead)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('content')"> <if test="orderCol.containsKey('logType')">
a.content a.logType
<if test='orderCol.content != null and "DESC".equalsIgnoreCase(orderCol.content)'>DESC</if> <if test='orderCol.logType != null and "DESC".equalsIgnoreCase(orderCol.logType)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createUserId')"> <if test="orderCol.containsKey('content')">
a.createUserId a.content
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if> <if test='orderCol.content != null and "DESC".equalsIgnoreCase(orderCol.content)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('createUserId')">
a.createTime a.createUserId
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateUserId')"> <if test="orderCol.containsKey('createTime')">
a.updateUserId a.createTime
<if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if> <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateTime')"> <if test="orderCol.containsKey('updateUserId')">
a.updateTime a.updateUserId
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateTime')">
a.updateTime
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
device-manager/src/main/resources/sqlmap/module/device/DeviceModuleMapper.xml
View file @ 84e02b55
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="DeviceModuleEntity" id="DeviceModuleEntity-Map"> <resultMap type="DeviceModuleEntity" id="DeviceModuleEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="moduleId" column="moduleId" /> <result property="moduleName" column="moduleName" />
<result property="deviceId" column="deviceId" /> <result property="moduleMsgCode" column="moduleMsgCode" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
...@@ -21,11 +21,11 @@ ...@@ -21,11 +21,11 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id, a.id,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('moduleId') or colPickMode == 1 and data.containsKey('moduleId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('moduleName') or colPickMode == 1 and data.containsKey('moduleName')))">
a.moduleId, a.moduleName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceId') or colPickMode == 1 and data.containsKey('deviceId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('moduleMsgCode') or colPickMode == 1 and data.containsKey('moduleMsgCode')))">
a.deviceId, a.moduleMsgCode,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime, a.createTime,
...@@ -41,18 +41,18 @@ ...@@ -41,18 +41,18 @@
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="DeviceModuleEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="DeviceModuleEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_device_module insert into mortals_xhx_device_module
(moduleId,deviceId,createTime,updateUserId,updateTime) (moduleName,moduleMsgCode,createTime,updateUserId,updateTime)
VALUES VALUES
(#{moduleId},#{deviceId},#{createTime},#{updateUserId},#{updateTime}) (#{moduleName},#{moduleMsgCode},#{createTime},#{updateUserId},#{updateTime})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_device_module insert into mortals_xhx_device_module
(moduleId,deviceId,createTime,updateUserId,updateTime) (moduleName,moduleMsgCode,createTime,updateUserId,updateTime)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.moduleId},#{item.deviceId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.moduleName},#{item.moduleMsgCode},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach> </foreach>
</insert> </insert>
...@@ -62,17 +62,11 @@ ...@@ -62,17 +62,11 @@
update mortals_xhx_device_module as a update mortals_xhx_device_module as a
set set
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('moduleId')) or (colPickMode==1 and !data.containsKey('moduleId'))"> <if test="(colPickMode==0 and data.containsKey('moduleName')) or (colPickMode==1 and !data.containsKey('moduleName'))">
a.moduleId=#{data.moduleId}, a.moduleName=#{data.moduleName},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('moduleIdIncrement')) or (colPickMode==1 and !data.containsKey('moduleIdIncrement'))"> <if test="(colPickMode==0 and data.containsKey('moduleMsgCode')) or (colPickMode==1 and !data.containsKey('moduleMsgCode'))">
a.moduleId=ifnull(a.moduleId,0) + #{data.moduleIdIncrement}, a.moduleMsgCode=#{data.moduleMsgCode},
</if>
<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>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))"> <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime}, a.createTime=#{data.createTime},
...@@ -98,30 +92,20 @@ ...@@ -98,30 +92,20 @@
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_xhx_device_module as a update mortals_xhx_device_module as a
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<trim prefix="moduleId=(case" suffix="ELSE moduleId end),"> <trim prefix="moduleName=(case" suffix="ELSE moduleName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <if test="(colPickMode==0 and item.containsKey('moduleName')) or (colPickMode==1 and !item.containsKey('moduleName'))">
<when test="(colPickMode==0 and item.containsKey('moduleId')) or (colPickMode==1 and !item.containsKey('moduleId'))"> when a.id=#{item.id} then #{item.moduleName}
when a.id=#{item.id} then #{item.moduleId} </if>
</when> </foreach>
<when test="(colPickMode==0 and item.containsKey('moduleIdIncrement')) or (colPickMode==1 and !item.containsKey('moduleIdIncrement'))"> </trim>
when a.id=#{item.id} then ifnull(a.moduleId,0) + #{item.moduleIdIncrement} <trim prefix="moduleMsgCode=(case" suffix="ELSE moduleMsgCode end),">
</when> <foreach collection="data.dataList" item="item" index="index" separator="" >
</choose> <if test="(colPickMode==0 and item.containsKey('moduleMsgCode')) or (colPickMode==1 and !item.containsKey('moduleMsgCode'))">
</foreach> when a.id=#{item.id} then #{item.moduleMsgCode}
</trim> </if>
<trim prefix="deviceId=(case" suffix="ELSE deviceId end),"> </foreach>
<foreach collection="data.dataList" item="item" index="index" separator="" > </trim>
<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="createTime=(case" suffix="ELSE createTime end),"> <trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
...@@ -270,48 +254,36 @@ ...@@ -270,48 +254,36 @@
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd} ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if> </if>
<if test="conditionParamRef.containsKey('moduleId')">
<if test="conditionParamRef.moduleId != null "> <if test="conditionParamRef.containsKey('moduleName')">
${_conditionType_} a.moduleId = #{${_conditionParam_}.moduleId} <if test="conditionParamRef.moduleName != null and conditionParamRef.moduleName != ''">
${_conditionType_} a.moduleName like #{${_conditionParam_}.moduleName}
</if> </if>
<if test="conditionParamRef.moduleId == null"> <if test="conditionParamRef.moduleName == null">
${_conditionType_} a.moduleId is null ${_conditionType_} a.moduleName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('moduleIdList')"> <if test="conditionParamRef.containsKey('moduleNameList')">
${_conditionType_} a.moduleId in ${_conditionType_} a.moduleName in
<foreach collection="conditionParamRef.moduleIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.moduleNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('moduleIdStart') and conditionParamRef.moduleIdStart != null">
${_conditionType_} a.moduleId <![CDATA[ >= ]]> #{${_conditionParam_}.moduleIdStart}
</if>
<if test="conditionParamRef.containsKey('moduleIdEnd') and conditionParamRef.moduleIdEnd != null">
${_conditionType_} a.moduleId <![CDATA[ <= ]]> #{${_conditionParam_}.moduleIdEnd}
</if>
<if test="conditionParamRef.containsKey('deviceId')"> <if test="conditionParamRef.containsKey('moduleMsgCode')">
<if test="conditionParamRef.deviceId != null "> <if test="conditionParamRef.moduleMsgCode != null and conditionParamRef.moduleMsgCode != ''">
${_conditionType_} a.deviceId = #{${_conditionParam_}.deviceId} ${_conditionType_} a.moduleMsgCode like #{${_conditionParam_}.moduleMsgCode}
</if> </if>
<if test="conditionParamRef.deviceId == null"> <if test="conditionParamRef.moduleMsgCode == null">
${_conditionType_} a.deviceId is null ${_conditionType_} a.moduleMsgCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceIdList')"> <if test="conditionParamRef.containsKey('moduleMsgCodeList')">
${_conditionType_} a.deviceId in ${_conditionType_} a.moduleMsgCode in
<foreach collection="conditionParamRef.deviceIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.moduleMsgCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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('createTime')"> <if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.createTime != null ">
...@@ -381,14 +353,14 @@ ...@@ -381,14 +353,14 @@
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if> <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('moduleId')"> <if test="orderCol.containsKey('moduleName')">
a.moduleId a.moduleName
<if test='orderCol.moduleId != null and "DESC".equalsIgnoreCase(orderCol.moduleId)'>DESC</if> <if test='orderCol.moduleName != null and "DESC".equalsIgnoreCase(orderCol.moduleName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('deviceId')"> <if test="orderCol.containsKey('moduleMsgCode')">
a.deviceId a.moduleMsgCode
<if test='orderCol.deviceId != null and "DESC".equalsIgnoreCase(orderCol.deviceId)'>DESC</if> <if test='orderCol.moduleMsgCode != null and "DESC".equalsIgnoreCase(orderCol.moduleMsgCode)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('createTime')">
......
device-manager/src/main/resources/sqlmap/module/device/DeviceModuleUseMapper.xml
View file @ 84e02b55
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.device.dao.ibatis.DeviceModuleUseDaoImpl"> <mapper namespace="com.mortals.xhx.module.device.dao.ibatis.DeviceModuleUseDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="DeviceModuleUseEntity" id="DeviceModuleUseEntity-Map"> <resultMap type="DeviceModuleUseEntity" id="DeviceModuleUseEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="moduleId" column="moduleId" /> <result property="moduleName" column="moduleName" />
<result property="useNum" column="useNum" /> <result property="moduleMsgCode" column="moduleMsgCode" />
<result property="createTime" column="createTime" /> <result property="deviceId" column="deviceId" />
<result property="updateUserId" column="updateUserId" /> <result property="useNum" column="useNum" />
<result property="updateTime" column="updateTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
<sql id="_columns"> <sql id="_columns">
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id, a.id,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('moduleId') or colPickMode == 1 and data.containsKey('moduleId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('moduleName') or colPickMode == 1 and data.containsKey('moduleName')))">
a.moduleId, a.moduleName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('useNum') or colPickMode == 1 and data.containsKey('useNum')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('moduleMsgCode') or colPickMode == 1 and data.containsKey('moduleMsgCode')))">
a.useNum, a.moduleMsgCode,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceId') or colPickMode == 1 and data.containsKey('deviceId')))">
a.createTime, a.deviceId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('useNum') or colPickMode == 1 and data.containsKey('useNum')))">
a.updateUserId, a.useNum,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.updateTime, a.createTime,
</if> </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> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="DeviceModuleUseEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="DeviceModuleUseEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_device_module_use insert into mortals_xhx_device_module_use
(moduleId,useNum,createTime,updateUserId,updateTime) (moduleName,moduleMsgCode,deviceId,useNum,createTime,updateUserId,updateTime)
VALUES VALUES
(#{moduleId},#{useNum},#{createTime},#{updateUserId},#{updateTime}) (#{moduleName},#{moduleMsgCode},#{deviceId},#{useNum},#{createTime},#{updateUserId},#{updateTime})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_device_module_use insert into mortals_xhx_device_module_use
(moduleId,useNum,createTime,updateUserId,updateTime) (moduleName,moduleMsgCode,deviceId,useNum,createTime,updateUserId,updateTime)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.moduleId},#{item.useNum},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.moduleName},#{item.moduleMsgCode},#{item.deviceId},#{item.useNum},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach> </foreach>
</insert> </insert>
...@@ -62,11 +70,17 @@ ...@@ -62,11 +70,17 @@
update mortals_xhx_device_module_use as a update mortals_xhx_device_module_use as a
set set
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('moduleId')) or (colPickMode==1 and !data.containsKey('moduleId'))"> <if test="(colPickMode==0 and data.containsKey('moduleName')) or (colPickMode==1 and !data.containsKey('moduleName'))">
a.moduleId=#{data.moduleId}, a.moduleName=#{data.moduleName},
</if>
<if test="(colPickMode==0 and data.containsKey('moduleMsgCode')) or (colPickMode==1 and !data.containsKey('moduleMsgCode'))">
a.moduleMsgCode=#{data.moduleMsgCode},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('moduleIdIncrement')) or (colPickMode==1 and !data.containsKey('moduleIdIncrement'))"> <if test="(colPickMode==0 and data.containsKey('deviceId')) or (colPickMode==1 and !data.containsKey('deviceId'))">
a.moduleId=ifnull(a.moduleId,0) + #{data.moduleIdIncrement}, 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>
<if test="(colPickMode==0 and data.containsKey('useNum')) or (colPickMode==1 and !data.containsKey('useNum'))"> <if test="(colPickMode==0 and data.containsKey('useNum')) or (colPickMode==1 and !data.containsKey('useNum'))">
a.useNum=#{data.useNum}, a.useNum=#{data.useNum},
...@@ -98,56 +112,70 @@ ...@@ -98,56 +112,70 @@
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_xhx_device_module_use as a update mortals_xhx_device_module_use as a
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<trim prefix="moduleId=(case" suffix="ELSE moduleId end),"> <trim prefix="moduleName=(case" suffix="ELSE moduleName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <if test="(colPickMode==0 and item.containsKey('moduleName')) or (colPickMode==1 and !item.containsKey('moduleName'))">
<when test="(colPickMode==0 and item.containsKey('moduleId')) or (colPickMode==1 and !item.containsKey('moduleId'))"> when a.id=#{item.id} then #{item.moduleName}
when a.id=#{item.id} then #{item.moduleId} </if>
</when> </foreach>
<when test="(colPickMode==0 and item.containsKey('moduleIdIncrement')) or (colPickMode==1 and !item.containsKey('moduleIdIncrement'))"> </trim>
when a.id=#{item.id} then ifnull(a.moduleId,0) + #{item.moduleIdIncrement} <trim prefix="moduleMsgCode=(case" suffix="ELSE moduleMsgCode end),">
</when> <foreach collection="data.dataList" item="item" index="index" separator="" >
</choose> <if test="(colPickMode==0 and item.containsKey('moduleMsgCode')) or (colPickMode==1 and !item.containsKey('moduleMsgCode'))">
</foreach> when a.id=#{item.id} then #{item.moduleMsgCode}
</trim> </if>
<trim prefix="useNum=(case" suffix="ELSE useNum end),"> </foreach>
<foreach collection="data.dataList" item="item" index="index" separator="" > </trim>
<choose> <trim prefix="deviceId=(case" suffix="ELSE deviceId end),">
<when test="(colPickMode==0 and item.containsKey('useNum')) or (colPickMode==1 and !item.containsKey('useNum'))"> <foreach collection="data.dataList" item="item" index="index" separator="" >
when a.id=#{item.id} then #{item.useNum} <choose>
</when> <when test="(colPickMode==0 and item.containsKey('deviceId')) or (colPickMode==1 and !item.containsKey('deviceId'))">
<when test="(colPickMode==0 and item.containsKey('useNumIncrement')) or (colPickMode==1 and !item.containsKey('useNumIncrement'))"> when a.id=#{item.id} then #{item.deviceId}
when a.id=#{item.id} then ifnull(a.useNum,0) + #{item.useNumIncrement} </when>
</when> <when test="(colPickMode==0 and item.containsKey('deviceIdIncrement')) or (colPickMode==1 and !item.containsKey('deviceIdIncrement'))">
</choose> when a.id=#{item.id} then ifnull(a.deviceId,0) + #{item.deviceIdIncrement}
</foreach> </when>
</trim> </choose>
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> </foreach>
<foreach collection="data.dataList" item="item" index="index" separator="" > </trim>
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> <trim prefix="useNum=(case" suffix="ELSE useNum end),">
when a.id=#{item.id} then #{item.createTime} <foreach collection="data.dataList" item="item" index="index" separator="" >
</if> <choose>
</foreach> <when test="(colPickMode==0 and item.containsKey('useNum')) or (colPickMode==1 and !item.containsKey('useNum'))">
</trim> when a.id=#{item.id} then #{item.useNum}
<trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),"> </when>
<foreach collection="data.dataList" item="item" index="index" separator="" > <when test="(colPickMode==0 and item.containsKey('useNumIncrement')) or (colPickMode==1 and !item.containsKey('useNumIncrement'))">
<choose> when a.id=#{item.id} then ifnull(a.useNum,0) + #{item.useNumIncrement}
<when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))"> </when>
when a.id=#{item.id} then #{item.updateUserId} </choose>
</when> </foreach>
<when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))"> </trim>
when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement} <trim prefix="createTime=(case" suffix="ELSE createTime end),">
</when> <foreach collection="data.dataList" item="item" index="index" separator="" >
</choose> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
</foreach> when a.id=#{item.id} then #{item.createTime}
</trim> </if>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),"> </foreach>
<foreach collection="data.dataList" item="item" index="index" separator="" > </trim>
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))"> <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
when a.id=#{item.id} then #{item.updateTime} <foreach collection="data.dataList" item="item" index="index" separator="" >
</if> <choose>
</foreach> <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
</trim> 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> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -249,163 +277,203 @@ ...@@ -249,163 +277,203 @@
${_conditionType_} a.id=#{${_conditionParam_}.id} ${_conditionType_} a.id=#{${_conditionParam_}.id}
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('id')"> <if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null "> <if test="conditionParamRef.id != null ">
${_conditionType_} a.id = #{${_conditionParam_}.id} ${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
<if test="conditionParamRef.id == null">
${_conditionType_} a.id is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.id == null">
${_conditionType_} a.id in ${_conditionType_} a.id is null
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null"> </if>
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} <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('moduleName')">
<if test="conditionParamRef.moduleName != null and conditionParamRef.moduleName != ''">
${_conditionType_} a.moduleName like #{${_conditionParam_}.moduleName}
</if> </if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null"> <if test="conditionParamRef.moduleName == null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd} ${_conditionType_} a.moduleName is null
</if> </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('moduleId')"> <if test="conditionParamRef.containsKey('moduleMsgCode')">
<if test="conditionParamRef.moduleId != null "> <if test="conditionParamRef.moduleMsgCode != null and conditionParamRef.moduleMsgCode != ''">
${_conditionType_} a.moduleId = #{${_conditionParam_}.moduleId} ${_conditionType_} a.moduleMsgCode like #{${_conditionParam_}.moduleMsgCode}
</if>
<if test="conditionParamRef.moduleId == null">
${_conditionType_} a.moduleId is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('moduleIdList')"> <if test="conditionParamRef.moduleMsgCode == null">
${_conditionType_} a.moduleId in ${_conditionType_} a.moduleMsgCode is null
<foreach collection="conditionParamRef.moduleIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('moduleIdStart') and conditionParamRef.moduleIdStart != null"> </if>
${_conditionType_} a.moduleId <![CDATA[ >= ]]> #{${_conditionParam_}.moduleIdStart} <if test="conditionParamRef.containsKey('moduleMsgCodeList')">
${_conditionType_} a.moduleMsgCode in
<foreach collection="conditionParamRef.moduleMsgCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceId')">
<if test="conditionParamRef.deviceId != null ">
${_conditionType_} a.deviceId = #{${_conditionParam_}.deviceId}
</if> </if>
<if test="conditionParamRef.containsKey('moduleIdEnd') and conditionParamRef.moduleIdEnd != null"> <if test="conditionParamRef.deviceId == null">
${_conditionType_} a.moduleId <![CDATA[ <= ]]> #{${_conditionParam_}.moduleIdEnd} ${_conditionType_} a.deviceId is null
</if> </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('useNum')"> <if test="conditionParamRef.containsKey('useNum')">
<if test="conditionParamRef.useNum != null "> <if test="conditionParamRef.useNum != null ">
${_conditionType_} a.useNum = #{${_conditionParam_}.useNum} ${_conditionType_} a.useNum = #{${_conditionParam_}.useNum}
</if>
<if test="conditionParamRef.useNum == null">
${_conditionType_} a.useNum is null
</if>
</if>
<if test="conditionParamRef.containsKey('useNumList')">
${_conditionType_} a.useNum in
<foreach collection="conditionParamRef.useNumList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('useNumStart') and conditionParamRef.useNumStart != null"> <if test="conditionParamRef.useNum == null">
${_conditionType_} a.useNum <![CDATA[ >= ]]> #{${_conditionParam_}.useNumStart} ${_conditionType_} a.useNum is null
</if>
<if test="conditionParamRef.containsKey('useNumEnd') and conditionParamRef.useNumEnd != null">
${_conditionType_} a.useNum <![CDATA[ <= ]]> #{${_conditionParam_}.useNumEnd}
</if> </if>
</if>
<if test="conditionParamRef.containsKey('useNumList')">
${_conditionType_} a.useNum in
<foreach collection="conditionParamRef.useNumList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('useNumStart') and conditionParamRef.useNumStart != null">
${_conditionType_} a.useNum <![CDATA[ >= ]]> #{${_conditionParam_}.useNumStart}
</if>
<if test="conditionParamRef.containsKey('useNumEnd') and conditionParamRef.useNumEnd != null">
${_conditionType_} a.useNum <![CDATA[ <= ]]> #{${_conditionParam_}.useNumEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime} ${_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>
<if test="conditionParamRef.containsKey('updateUserId')"> <if test="conditionParamRef.createTime == null">
<if test="conditionParamRef.updateUserId != null "> ${_conditionType_} a.createTime is 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>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> </if>
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} <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>
<if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null"> <if test="conditionParamRef.updateUserId == null">
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd} ${_conditionType_} a.updateUserId is null
</if> </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.containsKey('updateTime')">
<if test="conditionParamRef.updateTime != null "> <if test="conditionParamRef.updateTime != null ">
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime} ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if>
<if test="conditionParamRef.updateTime == null">
${_conditionType_} a.updateTime is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''"> <if test="conditionParamRef.updateTime == null">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime is null
</if>
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
</if>
<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>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
order by order by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind} ${item.colName} ${item.sortKind}
</foreach> </foreach>
</trim> </trim>
</if> </if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()"> <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by order by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
a.id a.id
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if> <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('moduleId')"> <if test="orderCol.containsKey('moduleName')">
a.moduleId a.moduleName
<if test='orderCol.moduleId != null and "DESC".equalsIgnoreCase(orderCol.moduleId)'>DESC</if> <if test='orderCol.moduleName != null and "DESC".equalsIgnoreCase(orderCol.moduleName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('useNum')"> <if test="orderCol.containsKey('moduleMsgCode')">
a.useNum a.moduleMsgCode
<if test='orderCol.useNum != null and "DESC".equalsIgnoreCase(orderCol.useNum)'>DESC</if> <if test='orderCol.moduleMsgCode != null and "DESC".equalsIgnoreCase(orderCol.moduleMsgCode)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('deviceId')">
a.createTime a.deviceId
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.deviceId != null and "DESC".equalsIgnoreCase(orderCol.deviceId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateUserId')"> <if test="orderCol.containsKey('useNum')">
a.updateUserId a.useNum
<if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if> <if test='orderCol.useNum != null and "DESC".equalsIgnoreCase(orderCol.useNum)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateTime')"> <if test="orderCol.containsKey('createTime')">
a.updateTime a.createTime
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
, ,
</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> </trim>
</if> </if>
</sql> </sql>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment