Skip to content

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

物联网1.0

parent 4f37832b
Show 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`)
DROP TABLE IF EXISTS `mortals_xhx_device_module`;
CREATE TABLE mortals_xhx_device_module(
`id` bigint(20) AUTO_INCREMENT COMMENT '主键ID，主键，自增长',
`moduleId` bigint(20) NOT NULL COMMENT '模块名称',
`deviceId` bigint(20) NOT NULL COMMENT '所属设备',
`createTime` datetime NOT NULL COMMENT '创建时间',
`moduleName` varchar(256) NOT NULL COMMENT '模块名称',
`moduleMsgCode` varchar(256) NOT NULL COMMENT '模块消息编码，与上报消息头编码一致，唯一',
`createTime` datetime COMMENT '创建时间',
`updateUserId` bigint(20) COMMENT '更新用户',
`updateTime` datetime COMMENT '更新时间',
PRIMARY KEY (`id`)
......@@ -143,14 +143,18 @@ PRIMARY KEY (`id`)
DROP TABLE IF EXISTS `mortals_xhx_device_module_use`;
CREATE TABLE mortals_xhx_device_module_use(
`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 '调用次数',
`createTime` datetime NOT NULL COMMENT '创建时间',
`createTime` datetime COMMENT '创建时间',
`updateUserId` bigint(20) COMMENT '更新用户',
`updateTime` datetime COMMENT '更新时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备模块使用频率';
-- ----------------------------
-- 设备告警配置表
-- ----------------------------
......@@ -193,9 +197,10 @@ CREATE TABLE mortals_xhx_device_log(
`id` bigint(20) AUTO_INCREMENT COMMENT '主键ID，主键，自增长',
`traceID` varchar(64) COMMENT 'traceId,日志追踪id',
`deviceId` bigint(20) COMMENT '设备ID',
`deviceNum` varchar(32) NOT NULL COMMENT '设备编号',
`deviceCode` 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 '内容',
`createUserId` bigint(20) NOT NULL COMMENT '创建用户',
`createTime` datetime NOT NULL COMMENT '创建时间',
......@@ -204,6 +209,8 @@ CREATE TABLE mortals_xhx_device_log(
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备日志';
-- ----------------------------
-- 站点统计表
-- ----------------------------
......
device-manager-ui/admin/src/components/SearchForm.vue
View file @ 84e02b55
......@@ -161,7 +161,7 @@
v-if="item.type === 'datetime'"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间"
:placeholder="item.label"
>
</el-date-picker>
......
device-manager-ui/admin/src/views/device/alarm/info/list.vue
View file @ 84e02b55
<template>
<div class="page">
<LayoutTable :data="tableData" notAdd :config="tableConfig"> </LayoutTable>
<LayoutTable :data="tableData" notAdd notDel :config="tableConfig"> </LayoutTable>
<dialog-show ref="dialogform" @ok="getData" />
</div>
......@@ -26,6 +26,7 @@ export default {
//this.config.addQuery = { deviceId, deviceType };
if (this.queryIn.alarmDevice) {
this.query={}
this.query["alarmDevice"] = this.queryIn.alarmDevice;
}
......@@ -60,21 +61,29 @@ export default {
return {
config: {
search: [
{
name: "alarmDevice",
type: "text",
label: "告警设备",
fuzzy: true,
},
{
name: "alarmStatus",
type: "select",
label: "告警状态,来自工单系统",
fuzzy: true,
label: "告警状态",
},
{
name: "alarmTimeStart",
type: "datetime",
label: "开始时间",
},
{
name: "alarmTimeEnd",
type: "datetime",
label: "结束时间",
placeholder:"结束时间"
},
],
columns: [
{ type: "selection", width: 60 },
{
label: "告警时间",
......@@ -87,33 +96,24 @@ export default {
prop: "alarmDevice",
formatter: this.formatterString,
},
{ label: "告警类型,", prop: "alarmType", formatter: this.formatter },
{
label: "告警内容",
prop: "alarmContent",
},
{ label: "告警级别", prop: "alarmLevel", formatter: this.formatter },
{ label: "接收人员,", prop: "alarmReceivePersonnel" },
{
label: "告警状态,来自工单系统",
label: "告警状态",
prop: "alarmStatus",
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 @@
<el-dialog :title="title" :visible.sync="open" width="90%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<Field label="模块名称" prop="moduleId" v-model="form.moduleId" placeholder="请输入模块名称"/>
<Field label="所属设备" prop="deviceId" v-model="form.deviceId" placeholder="请输入所属设备"/>
<Field label="模块名称" prop="moduleName" v-model="form.moduleName" type="textarea" placeholder="请输入模块名称"/>
<Field label="模块消息编码，与上报消息头编码一致，唯一" prop="moduleMsgCode" v-model="form.moduleMsgCode" type="textarea" placeholder="请输入模块消息编码，与上报消息头编码一致，唯一"/>
</el-row>
......@@ -36,8 +36,13 @@
],
// 表单校验
rules: {
createTime: [
{required: true,message: "请选择创建时间" },
moduleName: [
{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 @@
// 表单重置
reset() {
this.form = {
moduleId : null,
deviceId : null,
moduleName : "",
moduleMsgCode : "",
};
this.resetForm("form");
},
......
device-manager-ui/admin/src/views/device/module/list.vue
View file @ 84e02b55
......@@ -13,31 +13,9 @@
import table from "@/assets/mixins/table";
export default {
name: "DeviceModule",
props: {
queryIn: {
type: Object,
default: null,
},
},
components: {dialogShow },
mixins: [table],
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: {
......
device-manager-ui/admin/src/views/device/module/use/dialogshow.vue
View file @ 84e02b55
......@@ -3,7 +3,9 @@
<el-dialog :title="title" :visible.sync="open" width="90%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<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="请输入调用次数"/>
</el-row>
......@@ -36,8 +38,9 @@
],
// 表单校验
rules: {
createTime: [
{required: true,message: "请选择创建时间" },
moduleName: [
{required: true,message: "请输入模块名称", trigger: "blur" },
{max: 256,message: "最多只能录入256个字符",trigger: "blur",},
],
}
};
......@@ -88,7 +91,9 @@
// 表单重置
reset() {
this.form = {
moduleId : null,
moduleName : "",
moduleMsgCode : null,
deviceId : null,
useNum : null,
};
this.resetForm("form");
......
device-manager-ui/admin/src/views/system/param/dialogshow.vue
View file @ 84e02b55
......@@ -65,7 +65,7 @@
</template>
<script>
import form from "@/assets/mixins/form";
import form from "@/assets/mixins/formdialog";
export default {
mixins: [form],
data() {
......@@ -82,6 +82,7 @@ export default {
paramKey: [{ 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;
* @author zxfei
*/
public enum LogTypeEnum {
上报事件(0, "上报事件"),
下发服务(1, "下发服务");
上报事件(0, "上行"),
下发服务(1, "下行");
private Integer value;
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
deviceLogEntity.initAttrValue();
deviceLogEntity.setDeviceId(deviceEntity.getId());
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.setLogType(LogTypeEnum.上报事件.getValue());
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;
import com.mortals.xhx.common.code.DeviceMethodEnum;
import com.mortals.xhx.common.code.DeviceStatusEnum;
import com.mortals.xhx.common.key.ParamKey;
import com.mortals.xhx.module.device.model.DeviceLogEntity;
import com.mortals.xhx.module.device.model.DeviceLogQuery;
import com.mortals.xhx.module.device.model.*;
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.platform.model.PlatformEntity;
import com.mortals.xhx.module.platform.service.PlatformService;
......@@ -26,6 +27,9 @@ import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 设备状态任务
......@@ -41,21 +45,87 @@ public class DeviceStatTaskImpl implements ITaskExcuteService {
private DeviceService deviceService;
@Autowired
private DeviceLogService deviceLogService;
@Autowired
private DeviceModuleUseService deviceModuleUseService;
@Autowired
private ParamService paramService;
@Autowired
private ProductService productService;
@Autowired
private PlatformService platformService;
@Autowired
private DeviceModuleService moduleService;
@Override
public void excuteTask(ITask task) throws AppException {
log.debug("设备状态统计，开始执行");
log.debug("设备统计，开始执行");
doDeviceModuleUse();
//doDeviceUpOrDown();
//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;
* 设备模块信息 DAO接口
*
* @author zxfei
* @date 2022-06-27
* @date 2022-07-02
*/
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;
* 设备模块使用频率 DAO接口
*
* @author zxfei
* @date 2022-06-27
* @date 2022-07-02
*/
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;
* 设备模块信息DaoImpl DAO接口
*
* @author zxfei
* @date 2022-06-27
* @date 2022-07-02
*/
@Repository("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;
* 设备模块使用频率DaoImpl DAO接口
*
* @author zxfei
* @date 2022-06-27
* @date 2022-07-02
*/
@Repository("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,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.device.model.vo.DeviceLogVo;
/**
* 设备日志实体对象
*
* @author zxfei
* @date 2022-07-01
*/
* 设备日志实体对象
*
* @author zxfei
* @date 2022-07-02
*/
public class DeviceLogEntity extends DeviceLogVo {
private static final long serialVersionUID = 1L;
......@@ -27,13 +27,17 @@ public class DeviceLogEntity extends DeviceLogVo {
/**
* 设备编号
*/
private String deviceNum;
private String deviceCode;
/**
* 设备名称，设置设备名称。
*/
private String deviceName;
/**
* 日志类型，(0.上报事件，1.下发服务)
* 业务消息头标识
*/
private String messageHead;
/**
* 消息类型，(0.上行，1.下行)
*/
private Integer logType;
/**
......@@ -76,15 +80,15 @@ public class DeviceLogEntity extends DeviceLogVo {
* 获取 设备编号
* @return String
*/
public String getDeviceNum(){
return deviceNum;
public String getDeviceCode(){
return deviceCode;
}
/**
* 设置 设备编号
* @param deviceNum
* @param deviceCode
*/
public void setDeviceNum(String deviceNum){
this.deviceNum = deviceNum;
public void setDeviceCode(String deviceCode){
this.deviceCode = deviceCode;
}
/**
* 获取 设备名称，设置设备名称。
......@@ -101,14 +105,28 @@ public class DeviceLogEntity extends DeviceLogVo {
this.deviceName = deviceName;
}
/**
* 获取 日志类型，(0.上报事件，1.下发服务)
* 获取 业务消息头标识
* @return String
*/
public String getMessageHead(){
return messageHead;
}
/**
* 设置 业务消息头标识
* @param messageHead
*/
public void setMessageHead(String messageHead){
this.messageHead = messageHead;
}
/**
* 获取 消息类型，(0.上行，1.下行)
* @return Integer
*/
public Integer getLogType(){
return logType;
}
/**
* 设置 日志类型，(0.上报事件，1.下发服务)
* 设置 消息类型，(0.上行，1.下行)
* @param logType
*/
public void setLogType(Integer logType){
......@@ -152,8 +170,9 @@ public class DeviceLogEntity extends DeviceLogVo {
StringBuilder sb = new StringBuilder("");
sb.append(",traceID:").append(getTraceID());
sb.append(",deviceId:").append(getDeviceId());
sb.append(",deviceNum:").append(getDeviceNum());
sb.append(",deviceCode:").append(getDeviceCode());
sb.append(",deviceName:").append(getDeviceName());
sb.append(",messageHead:").append(getMessageHead());
sb.append(",logType:").append(getLogType());
sb.append(",content:").append(getContent());
return sb.toString();
......@@ -165,10 +184,12 @@ public class DeviceLogEntity extends DeviceLogVo {
this.deviceId = null;
this.deviceNum = "";
this.deviceCode = "";
this.deviceName = "";
this.messageHead = "";
this.logType = null;
this.content = "";
......
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;
import java.util.List;
import com.mortals.xhx.module.device.model.DeviceLogEntity;
/**
* 设备日志查询对象
*
* @author zxfei
* @date 2022-07-01
*/
* 设备日志查询对象
*
* @author zxfei
* @date 2022-07-02
*/
public class DeviceLogQuery extends DeviceLogEntity {
/** 开始 主键ID，主键，自增长 */
private Long idStart;
......@@ -37,21 +37,24 @@ public class DeviceLogQuery extends DeviceLogEntity {
private List <Long> deviceIdList;
/** 设备编号 */
private List<String> deviceNumList;
private List<String> deviceCodeList;
/** 设备名称，设置设备名称。 */
private List<String> deviceNameList;
/** 开始 日志类型，(0.上报事件，1.下发服务) */
/** 业务消息头标识 */
private List<String> messageHeadList;
/** 开始 消息类型，(0.上行，1.下行) */
private Integer logTypeStart;
/** 结束 日志类型，(0.上报事件，1.下发服务) */
/** 结束 消息类型，(0.上行，1.下行) */
private Integer logTypeEnd;
/** 增加 日志类型，(0.上报事件，1.下发服务) */
/** 增加 消息类型，(0.上行，1.下行) */
private Integer logTypeIncrement;
/** 日志类型，(0.上报事件，1.下发服务)列表 */
/** 消息类型，(0.上行，1.下行)列表 */
private List <Integer> logTypeList;
/** 内容 */
......@@ -246,18 +249,18 @@ public class DeviceLogQuery extends DeviceLogEntity {
/**
* 获取 设备编号
* @return deviceNumList
* @return deviceCodeList
*/
public List<String> getDeviceNumList(){
return this.deviceNumList;
public List<String> getDeviceCodeList(){
return this.deviceCodeList;
}
/**
* 设置 设备编号
* @param deviceNumList
* @param deviceCodeList
*/
public void setDeviceNumList(List<String> deviceNumList){
this.deviceNumList = deviceNumList;
public void setDeviceCodeList(List<String> deviceCodeList){
this.deviceCodeList = deviceCodeList;
}
/**
* 获取 设备名称，设置设备名称。
......@@ -275,7 +278,22 @@ public class DeviceLogQuery extends DeviceLogEntity {
this.deviceNameList = deviceNameList;
}
/**
* 获取 开始 日志类型，(0.上报事件，1.下发服务)
* 获取 业务消息头标识
* @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(){
......@@ -283,7 +301,7 @@ public class DeviceLogQuery extends DeviceLogEntity {
}
/**
* 设置 开始 日志类型，(0.上报事件，1.下发服务)
* 设置 开始 消息类型，(0.上行，1.下行)
* @param logTypeStart
*/
public void setLogTypeStart(Integer logTypeStart){
......@@ -291,7 +309,7 @@ public class DeviceLogQuery extends DeviceLogEntity {
}
/**
* 获取 结束 日志类型，(0.上报事件，1.下发服务)
* 获取 结束 消息类型，(0.上行，1.下行)
* @return $logTypeEnd
*/
public Integer getLogTypeEnd(){
......@@ -299,7 +317,7 @@ public class DeviceLogQuery extends DeviceLogEntity {
}
/**
* 设置 结束 日志类型，(0.上报事件，1.下发服务)
* 设置 结束 消息类型，(0.上行，1.下行)
* @param logTypeEnd
*/
public void setLogTypeEnd(Integer logTypeEnd){
......@@ -307,7 +325,7 @@ public class DeviceLogQuery extends DeviceLogEntity {
}
/**
* 获取 增加 日志类型，(0.上报事件，1.下发服务)
* 获取 增加 消息类型，(0.上行，1.下行)
* @return logTypeIncrement
*/
public Integer getLogTypeIncrement(){
......@@ -315,7 +333,7 @@ public class DeviceLogQuery extends DeviceLogEntity {
}
/**
* 设置 增加 日志类型，(0.上报事件，1.下发服务)
* 设置 增加 消息类型，(0.上行，1.下行)
* @param logTypeIncrement
*/
public void setLogTypeIncrement(Integer logTypeIncrement){
......@@ -323,7 +341,7 @@ public class DeviceLogQuery extends DeviceLogEntity {
}
/**
* 获取 日志类型，(0.上报事件，1.下发服务)
* 获取 消息类型，(0.上行，1.下行)
* @return logTypeList
*/
public List<Integer> getLogTypeList(){
......@@ -331,7 +349,7 @@ public class DeviceLogQuery extends DeviceLogEntity {
}
/**
* 设置 日志类型，(0.上报事件，1.下发服务)
* 设置 消息类型，(0.上行，1.下行)
* @param logTypeList
*/
public void setLogTypeList(List<Integer> logTypeList){
......@@ -657,19 +675,19 @@ public class DeviceLogQuery extends DeviceLogEntity {
/**
* 设置 设备编号
* @param deviceNum
* @param deviceCode
*/
public DeviceLogQuery deviceNum(String deviceNum){
setDeviceNum(deviceNum);
public DeviceLogQuery deviceCode(String deviceCode){
setDeviceCode(deviceCode);
return this;
}
/**
* 设置 设备编号
* @param deviceNumList
* @param deviceCodeList
*/
public DeviceLogQuery deviceNumList(List<String> deviceNumList){
this.deviceNumList = deviceNumList;
public DeviceLogQuery deviceCodeList(List<String> deviceCodeList){
this.deviceCodeList = deviceCodeList;
return this;
}
......@@ -692,8 +710,27 @@ public class DeviceLogQuery extends DeviceLogEntity {
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
*/
public DeviceLogQuery logType(Integer logType){
......@@ -702,7 +739,7 @@ public class DeviceLogQuery extends DeviceLogEntity {
}
/**
* 设置 开始 日志类型，(0.上报事件，1.下发服务)
* 设置 开始 消息类型，(0.上行，1.下行)
* @param logTypeStart
*/
public DeviceLogQuery logTypeStart(Integer logTypeStart){
......@@ -711,7 +748,7 @@ public class DeviceLogQuery extends DeviceLogEntity {
}
/**
* 设置 结束 日志类型，(0.上报事件，1.下发服务)
* 设置 结束 消息类型，(0.上行，1.下行)
* @param logTypeEnd
*/
public DeviceLogQuery logTypeEnd(Integer logTypeEnd){
......@@ -720,7 +757,7 @@ public class DeviceLogQuery extends DeviceLogEntity {
}
/**
* 设置 增加 日志类型，(0.上报事件，1.下发服务)
* 设置 增加 消息类型，(0.上行，1.下行)
* @param logTypeIncrement
*/
public DeviceLogQuery logTypeIncrement(Integer logTypeIncrement){
......@@ -729,7 +766,7 @@ public class DeviceLogQuery extends DeviceLogEntity {
}
/**
* 设置 日志类型，(0.上报事件，1.下发服务)
* 设置 消息类型，(0.上行，1.下行)
* @param logTypeList
*/
public DeviceLogQuery logTypeList(List<Integer> logTypeList){
......
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;
* 设备模块信息实体对象
*
* @author zxfei
* @date 2022-07-01
* @date 2022-07-02
*/
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(){}
/**
* 获取 模块名称
* @return Long
* @return String
*/
public Long getModuleId(){
return moduleId;
public String getModuleName(){
return moduleName;
}
/**
* 设置 模块名称
* @param moduleId
* @param moduleName
*/
public void setModuleId(Long moduleId){
this.moduleId = moduleId;
public void setModuleName(String moduleName){
this.moduleName = moduleName;
}
/**
* 获取 所属设备
* @return Long
* 获取 模块消息编码，与上报消息头编码一致，唯一
* @return String
*/
public Long getDeviceId(){
return deviceId;
public String getModuleMsgCode(){
return moduleMsgCode;
}
/**
* 设置 所属设备
* @param deviceId
* 设置 模块消息编码，与上报消息头编码一致，唯一
* @param moduleMsgCode
*/
public void setDeviceId(Long deviceId){
this.deviceId = deviceId;
public void setModuleMsgCode(String moduleMsgCode){
this.moduleMsgCode = moduleMsgCode;
}
......@@ -78,15 +78,15 @@ public class DeviceModuleEntity extends DeviceModuleVo {
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",moduleId:").append(getModuleId());
sb.append(",deviceId:").append(getDeviceId());
sb.append(",moduleName:").append(getModuleName());
sb.append(",moduleMsgCode:").append(getModuleMsgCode());
return sb.toString();
}
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;
* 设备模块信息查询对象
*
* @author zxfei
* @date 2022-07-01
* @date 2022-07-02
*/
public class DeviceModuleQuery extends DeviceModuleEntity {
/** 开始 主键ID，主键，自增长 */
......@@ -21,29 +21,11 @@ public class DeviceModuleQuery extends DeviceModuleEntity {
/** 主键ID，主键，自增长列表 */
private List <Long> idList;
/** 开始 模块名称 */
private Long moduleIdStart;
/** 模块名称 */
private List<String> moduleNameList;
/** 结束 模块名称 */
private Long moduleIdEnd;
/** 增加 模块名称 */
private Long moduleIdIncrement;
/** 模块名称列表 */
private List <Long> moduleIdList;
/** 开始 所属设备 */
private Long deviceIdStart;
/** 结束 所属设备 */
private Long deviceIdEnd;
/** 增加 所属设备 */
private Long deviceIdIncrement;
/** 所属设备列表 */
private List <Long> deviceIdList;
/** 模块消息编码，与上报消息头编码一致，唯一 */
private List<String> moduleMsgCodeList;
/** 开始 创建时间 */
private String createTimeStart;
......@@ -141,134 +123,36 @@ public class DeviceModuleQuery extends DeviceModuleEntity {
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(){
return this.moduleIdList;
public List<String> getModuleNameList(){
return this.moduleNameList;
}
/**
* 设置 模块名称
* @param moduleIdList
*/
public void setModuleIdList(List<Long> moduleIdList){
this.moduleIdList = moduleIdList;
}
/**
* 获取 开始 所属设备
* @return deviceIdStart
*/
public Long getDeviceIdStart(){
return this.deviceIdStart;
}
/**
* 设置 开始 所属设备
* @param deviceIdStart
*/
public void setDeviceIdStart(Long deviceIdStart){
this.deviceIdStart = deviceIdStart;
}
/**
* 获取 结束 所属设备
* @return $deviceIdEnd
*/
public Long getDeviceIdEnd(){
return this.deviceIdEnd;
}
/**
* 设置 结束 所属设备
* @param deviceIdEnd
*/
public void setDeviceIdEnd(Long deviceIdEnd){
this.deviceIdEnd = deviceIdEnd;
}
/**
* 获取 增加 所属设备
* @return deviceIdIncrement
*/
public Long getDeviceIdIncrement(){
return this.deviceIdIncrement;
}
/**
* 设置 增加 所属设备
* @param deviceIdIncrement
* @param moduleNameList
*/
public void setDeviceIdIncrement(Long deviceIdIncrement){
this.deviceIdIncrement = deviceIdIncrement;
public void setModuleNameList(List<String> moduleNameList){
this.moduleNameList = moduleNameList;
}
/**
* 获取 所属设备
* @return deviceIdList
* 获取 模块消息编码，与上报消息头编码一致，唯一
* @return moduleMsgCodeList
*/
public List<Long> getDeviceIdList(){
return this.deviceIdList;
public List<String> getModuleMsgCodeList(){
return this.moduleMsgCodeList;
}
/**
* 设置 所属设备
* @param deviceIdList
* 设置 模块消息编码，与上报消息头编码一致，唯一
* @param moduleMsgCodeList
*/
public void setDeviceIdList(List<Long> deviceIdList){
this.deviceIdList = deviceIdList;
public void setModuleMsgCodeList(List<String> moduleMsgCodeList){
this.moduleMsgCodeList = moduleMsgCodeList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
......@@ -442,93 +326,41 @@ public class DeviceModuleQuery extends DeviceModuleEntity {
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
*/
public DeviceModuleQuery moduleIdIncrement(Long moduleIdIncrement){
this.moduleIdIncrement = moduleIdIncrement;
return this;
}
/**
* 设置 模块名称
* @param moduleIdList
* @param moduleName
*/
public DeviceModuleQuery moduleIdList(List<Long> moduleIdList){
this.moduleIdList = moduleIdList;
public DeviceModuleQuery moduleName(String moduleName){
setModuleName(moduleName);
return this;
}
/**
* 设置 所属设备
* @param deviceId
*/
public DeviceModuleQuery deviceId(Long deviceId){
setDeviceId(deviceId);
return this;
}
/**
* 设置 开始 所属设备
* @param deviceIdStart
* 设置 模块名称
* @param moduleNameList
*/
public DeviceModuleQuery deviceIdStart(Long deviceIdStart){
this.deviceIdStart = deviceIdStart;
public DeviceModuleQuery moduleNameList(List<String> moduleNameList){
this.moduleNameList = moduleNameList;
return this;
}
/**
* 设置 结束 所属设备
* @param deviceIdEnd
*/
public DeviceModuleQuery deviceIdEnd(Long deviceIdEnd){
this.deviceIdEnd = deviceIdEnd;
return this;
}
/**
* 设置 增加 所属设备
* @param deviceIdIncrement
* 设置 模块消息编码，与上报消息头编码一致，唯一
* @param moduleMsgCode
*/
public DeviceModuleQuery deviceIdIncrement(Long deviceIdIncrement){
this.deviceIdIncrement = deviceIdIncrement;
public DeviceModuleQuery moduleMsgCode(String moduleMsgCode){
setModuleMsgCode(moduleMsgCode);
return this;
}
/**
* 设置 所属设备
* @param deviceIdList
* 设置 模块消息编码，与上报消息头编码一致，唯一
* @param moduleMsgCodeList
*/
public DeviceModuleQuery deviceIdList(List<Long> deviceIdList){
this.deviceIdList = deviceIdList;
public DeviceModuleQuery moduleMsgCodeList(List<String> moduleMsgCodeList){
this.moduleMsgCodeList = moduleMsgCodeList;
return this;
}
......
device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceModuleUseEntity.java
View file @ 84e02b55
......@@ -7,19 +7,27 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.device.model.vo.DeviceModuleUseVo;
/**
* 设备模块使用频率实体对象
*
* @author zxfei
* @date 2022-07-01
*/
* 设备模块使用频率实体对象
*
* @author zxfei
* @date 2022-07-02
*/
public class DeviceModuleUseEntity extends DeviceModuleUseVo {
private static final long serialVersionUID = 1L;
/**
* 模块ID
* 模块名称
*/
private String moduleName;
/**
* 模块消息编码
*/
private String moduleMsgCode;
/**
* 所属设备
*/
private Long moduleId;
private Long deviceId;
/**
* 调用次数
*/
......@@ -29,18 +37,46 @@ public class DeviceModuleUseEntity extends DeviceModuleUseVo {
public DeviceModuleUseEntity(){}
/**
* 获取 模块ID
* 获取 模块名称
* @return String
*/
public String getModuleName(){
return moduleName;
}
/**
* 设置 模块名称
* @param moduleName
*/
public void setModuleName(String moduleName){
this.moduleName = moduleName;
}
/**
* 获取 模块消息编码
* @return String
*/
public String getModuleMsgCode(){
return moduleMsgCode;
}
/**
* 设置 模块消息编码
* @param moduleMsgCode
*/
public void setModuleMsgCode(String moduleMsgCode){
this.moduleMsgCode = moduleMsgCode;
}
/**
* 获取 所属设备
* @return Long
*/
public Long getModuleId(){
return moduleId;
public Long getDeviceId(){
return deviceId;
}
/**
* 设置 模块ID
* @param moduleId
* 设置 所属设备
* @param deviceId
*/
public void setModuleId(Long moduleId){
this.moduleId = moduleId;
public void setDeviceId(Long deviceId){
this.deviceId = deviceId;
}
/**
* 获取 调用次数
......@@ -78,14 +114,20 @@ public class DeviceModuleUseEntity extends DeviceModuleUseVo {
public String toString(){
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());
return sb.toString();
}
public void initAttrValue(){
this.moduleId = null;
this.moduleName = "";
this.moduleMsgCode = "";
this.deviceId = null;
this.useNum = null;
}
......
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;
import java.util.List;
import com.mortals.xhx.module.device.model.DeviceModuleUseEntity;
/**
* 设备模块使用频率查询对象
*
* @author zxfei
* @date 2022-07-01
*/
* 设备模块使用频率查询对象
*
* @author zxfei
* @date 2022-07-02
*/
public class DeviceModuleUseQuery extends DeviceModuleUseEntity {
/** 开始 主键ID，主键，自增长 */
private Long idStart;
......@@ -21,17 +21,23 @@ public class DeviceModuleUseQuery extends DeviceModuleUseEntity {
/** 主键ID，主键，自增长列表 */
private List <Long> idList;
/** 开始 模块ID */
private Long moduleIdStart;
/** 模块名称 */
private List<String> moduleNameList;
/** 模块消息编码 */
private List<String> moduleMsgCodeList;
/** 开始 所属设备 */
private Long deviceIdStart;
/** 结束 模块ID */
private Long moduleIdEnd;
/** 结束 所属设备 */
private Long deviceIdEnd;
/** 增加 模块ID */
private Long moduleIdIncrement;
/** 增加 所属设备 */
private Long deviceIdIncrement;
/** 模块ID列表 */
private List <Long> moduleIdList;
/** 所属设备列表 */
private List <Long> deviceIdList;
/** 开始 调用次数 */
private Long useNumStart;
......@@ -142,67 +148,97 @@ public class DeviceModuleUseQuery extends DeviceModuleUseEntity {
}
/**
* 获取 开始 模块ID
* @return moduleIdStart
* 获取 模块名称
* @return moduleNameList
*/
public List<String> getModuleNameList(){
return this.moduleNameList;
}
/**
* 设置 模块名称
* @param moduleNameList
*/
public void setModuleNameList(List<String> moduleNameList){
this.moduleNameList = moduleNameList;
}
/**
* 获取 模块消息编码
* @return moduleMsgCodeList
*/
public List<String> getModuleMsgCodeList(){
return this.moduleMsgCodeList;
}
/**
* 设置 模块消息编码
* @param moduleMsgCodeList
*/
public void setModuleMsgCodeList(List<String> moduleMsgCodeList){
this.moduleMsgCodeList = moduleMsgCodeList;
}
/**
* 获取 开始 所属设备
* @return deviceIdStart
*/
public Long getModuleIdStart(){
return this.moduleIdStart;
public Long getDeviceIdStart(){
return this.deviceIdStart;
}
/**
* 设置 开始 模块ID
* @param moduleIdStart
* 设置 开始 所属设备
* @param deviceIdStart
*/
public void setModuleIdStart(Long moduleIdStart){
this.moduleIdStart = moduleIdStart;
public void setDeviceIdStart(Long deviceIdStart){
this.deviceIdStart = deviceIdStart;
}
/**
* 获取 结束 模块ID
* @return $moduleIdEnd
* 获取 结束 所属设备
* @return $deviceIdEnd
*/
public Long getModuleIdEnd(){
return this.moduleIdEnd;
public Long getDeviceIdEnd(){
return this.deviceIdEnd;
}
/**
* 设置 结束 模块ID
* @param moduleIdEnd
* 设置 结束 所属设备
* @param deviceIdEnd
*/
public void setModuleIdEnd(Long moduleIdEnd){
this.moduleIdEnd = moduleIdEnd;
public void setDeviceIdEnd(Long deviceIdEnd){
this.deviceIdEnd = deviceIdEnd;
}
/**
* 获取 增加 模块ID
* @return moduleIdIncrement
* 获取 增加 所属设备
* @return deviceIdIncrement
*/
public Long getModuleIdIncrement(){
return this.moduleIdIncrement;
public Long getDeviceIdIncrement(){
return this.deviceIdIncrement;
}
/**
* 设置 增加 模块ID
* @param moduleIdIncrement
* 设置 增加 所属设备
* @param deviceIdIncrement
*/
public void setModuleIdIncrement(Long moduleIdIncrement){
this.moduleIdIncrement = moduleIdIncrement;
public void setDeviceIdIncrement(Long deviceIdIncrement){
this.deviceIdIncrement = deviceIdIncrement;
}
/**
* 获取 模块ID
* @return moduleIdList
* 获取 所属设备
* @return deviceIdList
*/
public List<Long> getModuleIdList(){
return this.moduleIdList;
public List<Long> getDeviceIdList(){
return this.deviceIdList;
}
/**
* 设置 模块ID
* @param moduleIdList
* 设置 所属设备
* @param deviceIdList
*/
public void setModuleIdList(List<Long> moduleIdList){
this.moduleIdList = moduleIdList;
public void setDeviceIdList(List<Long> deviceIdList){
this.deviceIdList = deviceIdList;
}
/**
......@@ -442,48 +478,86 @@ public class DeviceModuleUseQuery extends DeviceModuleUseEntity {
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;
}
/**
* 设置 模块消息编码
* @param moduleMsgCode
*/
public DeviceModuleUseQuery moduleMsgCode(String moduleMsgCode){
setModuleMsgCode(moduleMsgCode);
return this;
}
/**
* 设置 模块消息编码
* @param moduleMsgCodeList
*/
public DeviceModuleUseQuery moduleMsgCodeList(List<String> moduleMsgCodeList){
this.moduleMsgCodeList = moduleMsgCodeList;
return this;
}
/**
* 设置 模块ID
* @param moduleId
* 设置 所属设备
* @param deviceId
*/
public DeviceModuleUseQuery moduleId(Long moduleId){
setModuleId(moduleId);
public DeviceModuleUseQuery deviceId(Long deviceId){
setDeviceId(deviceId);
return this;
}
/**
* 设置 开始 模块ID
* @param moduleIdStart
* 设置 开始 所属设备
* @param deviceIdStart
*/
public DeviceModuleUseQuery moduleIdStart(Long moduleIdStart){
this.moduleIdStart = moduleIdStart;
public DeviceModuleUseQuery deviceIdStart(Long deviceIdStart){
this.deviceIdStart = deviceIdStart;
return this;
}
/**
* 设置 结束 模块ID
* @param moduleIdEnd
* 设置 结束 所属设备
* @param deviceIdEnd
*/
public DeviceModuleUseQuery moduleIdEnd(Long moduleIdEnd){
this.moduleIdEnd = moduleIdEnd;
public DeviceModuleUseQuery deviceIdEnd(Long deviceIdEnd){
this.deviceIdEnd = deviceIdEnd;
return this;
}
/**
* 设置 增加 模块ID
* @param moduleIdIncrement
* 设置 增加 所属设备
* @param deviceIdIncrement
*/
public DeviceModuleUseQuery moduleIdIncrement(Long moduleIdIncrement){
this.moduleIdIncrement = moduleIdIncrement;
public DeviceModuleUseQuery deviceIdIncrement(Long deviceIdIncrement){
this.deviceIdIncrement = deviceIdIncrement;
return this;
}
/**
* 设置 模块ID
* @param moduleIdList
* 设置 所属设备
* @param deviceIdList
*/
public DeviceModuleUseQuery moduleIdList(List<Long> moduleIdList){
this.moduleIdList = moduleIdList;
public DeviceModuleUseQuery deviceIdList(List<Long> deviceIdList){
this.deviceIdList = deviceIdList;
return this;
}
......
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;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.device.model.DeviceAlarmInfoEntity;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
......@@ -9,6 +11,12 @@ import java.util.List;
* @author zxfei
* @date 2022-07-01
*/
@Data
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;
* 设备模块使用频率视图对象
*
* @author zxfei
* @date 2022-07-01
* @date 2022-07-02
*/
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;
* 设备模块信息视图对象
*
* @author zxfei
* @date 2022-07-01
* @date 2022-07-02
*/
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;
* 设备模块信息 service接口
*
* @author zxfei
* @date 2022-06-27
* @date 2022-07-02
*/
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;
* 设备模块使用频率 service接口
*
* @author zxfei
* @date 2022-06-27
* @date 2022-07-02
*/
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;
* 设备模块信息 service实现
*
* @author zxfei
* @date 2022-06-27
* @date 2022-07-02
*/
@Service("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;
* 设备模块使用频率 service实现
*
* @author zxfei
* @date 2022-06-27
* @date 2022-07-02
*/
@Service("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;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
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.DeviceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
import java.util.stream.Collectors;
/**
*
* 设备告警日志
*
* @author zxfei
* @date 2022-06-27
*/
* 设备告警日志
*
* @author zxfei
* @date 2022-06-27
*/
@RestController
@RequestMapping("device/alarm/info")
public class DeviceAlarmInfoController extends BaseCRUDJsonBodyMappingController<DeviceAlarmInfoService,DeviceAlarmInfoEntity,Long> {
public class DeviceAlarmInfoController extends BaseCRUDJsonBodyMappingController<DeviceAlarmInfoService, DeviceAlarmInfoEntity, Long> {
@Autowired
private ParamService paramService;
@Autowired
private DeviceService deviceService;
public DeviceAlarmInfoController(){
super.setModuleDesc( "设备告警日志");
public DeviceAlarmInfoController() {
super.setModuleDesc("设备告警日志");
}
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "alarmType", paramService.getParamBySecondOrganize("DeviceAlarmInfo","alarmType"));
this.addDict(model, "alarmLevel", paramService.getParamBySecondOrganize("DeviceAlarmInfo","alarmLevel"));
this.addDict(model, "alarmStatus", paramService.getParamBySecondOrganize("DeviceAlarmInfo","alarmStatus"));
this.addDict(model, "alarmType", paramService.getParamBySecondOrganize("DeviceAlarmInfo", "alarmType"));
this.addDict(model, "alarmLevel", paramService.getParamBySecondOrganize("DeviceAlarmInfo", "alarmLevel"));
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);
}
......
device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceModuleController.java
View file @ 84e02b55
package com.mortals.xhx.module.device.web;
import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.module.device.model.DeviceModuleEntity;
import com.mortals.xhx.module.device.service.DeviceModuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.mortals.framework.model.Context;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.device.model.DeviceModuleEntity;
import com.mortals.xhx.module.device.service.DeviceModuleService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject;
import java.util.Arrays;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*;
/**
*
* 设备模块信息
*
* @author zxfei
* @date 2022-06-27
* @date 2022-07-02
*/
@RestController
@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;
import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.module.device.model.DeviceModuleUseEntity;
import com.mortals.xhx.module.device.service.DeviceModuleUseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.mortals.framework.model.Context;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.device.model.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.stream.Collectors;
import com.alibaba.fastjson.JSONObject;
import java.util.Arrays;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*;
/**
*
* 设备模块使用频率
*
* @author zxfei
* @date 2022-06-27
* @date 2022-07-02
*/
@RestController
@RequestMapping("device/module/use")
......
device-manager/src/main/resources/sqlmap/module/device/DeviceLogMapper.xml
View file @ 84e02b55
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.device.dao.ibatis.DeviceLogDaoImpl">
<!-- 字段和属性映射 -->
......@@ -8,8 +8,9 @@
<id property="id" column="id" />
<result property="traceID" column="traceID" />
<result property="deviceId" column="deviceId" />
<result property="deviceNum" column="deviceNum" />
<result property="deviceCode" column="deviceCode" />
<result property="deviceName" column="deviceName" />
<result property="messageHead" column="messageHead" />
<result property="logType" column="logType" />
<result property="content" column="content" />
<result property="createUserId" column="createUserId" />
......@@ -32,12 +33,15 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceId') or colPickMode == 1 and data.containsKey('deviceId')))">
a.deviceId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceNum') or colPickMode == 1 and data.containsKey('deviceNum')))">
a.deviceNum,
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceCode') or colPickMode == 1 and data.containsKey('deviceCode')))">
a.deviceCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceName') or colPickMode == 1 and data.containsKey('deviceName')))">
a.deviceName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('messageHead') or colPickMode == 1 and data.containsKey('messageHead')))">
a.messageHead,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('logType') or colPickMode == 1 and data.containsKey('logType')))">
a.logType,
</if>
......@@ -61,18 +65,18 @@
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="DeviceLogEntity" useGeneratedKeys="true" keyProperty="id">
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
(#{traceID},#{deviceId},#{deviceNum},#{deviceName},#{logType},#{content},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
(#{traceID},#{deviceId},#{deviceCode},#{deviceName},#{messageHead},#{logType},#{content},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
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
<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>
</insert>
......@@ -91,12 +95,15 @@
<if test="(colPickMode==0 and data.containsKey('deviceIdIncrement')) or (colPickMode==1 and !data.containsKey('deviceIdIncrement'))">
a.deviceId=ifnull(a.deviceId,0) + #{data.deviceIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('deviceNum')) or (colPickMode==1 and !data.containsKey('deviceNum'))">
a.deviceNum=#{data.deviceNum},
<if test="(colPickMode==0 and data.containsKey('deviceCode')) or (colPickMode==1 and !data.containsKey('deviceCode'))">
a.deviceCode=#{data.deviceCode},
</if>
<if test="(colPickMode==0 and data.containsKey('deviceName')) or (colPickMode==1 and !data.containsKey('deviceName'))">
a.deviceName=#{data.deviceName},
</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'))">
a.logType=#{data.logType},
</if>
......@@ -155,10 +162,10 @@
</choose>
</foreach>
</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="" >
<if test="(colPickMode==0 and item.containsKey('deviceNum')) or (colPickMode==1 and !item.containsKey('deviceNum'))">
when a.id=#{item.id} then #{item.deviceNum}
<if test="(colPickMode==0 and item.containsKey('deviceCode')) or (colPickMode==1 and !item.containsKey('deviceCode'))">
when a.id=#{item.id} then #{item.deviceCode}
</if>
</foreach>
</trim>
......@@ -169,6 +176,13 @@
</if>
</foreach>
</trim>
<trim prefix="messageHead=(case" suffix="ELSE messageHead end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('messageHead')) or (colPickMode==1 and !item.containsKey('messageHead'))">
when a.id=#{item.id} then #{item.messageHead}
</if>
</foreach>
</trim>
<trim prefix="logType=(case" suffix="ELSE logType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -385,17 +399,17 @@
</if>
<if test="conditionParamRef.containsKey('deviceNum')">
<if test="conditionParamRef.deviceNum != null and conditionParamRef.deviceNum != ''">
${_conditionType_} a.deviceNum like #{${_conditionParam_}.deviceNum}
<if test="conditionParamRef.containsKey('deviceCode')">
<if test="conditionParamRef.deviceCode != null and conditionParamRef.deviceCode != ''">
${_conditionType_} a.deviceCode like #{${_conditionParam_}.deviceCode}
</if>
<if test="conditionParamRef.deviceNum == null">
${_conditionType_} a.deviceNum is null
<if test="conditionParamRef.deviceCode == null">
${_conditionType_} a.deviceCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('deviceNumList')">
${_conditionType_} a.deviceNum in
<foreach collection="conditionParamRef.deviceNumList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.containsKey('deviceCodeList')">
${_conditionType_} a.deviceCode in
<foreach collection="conditionParamRef.deviceCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
......@@ -414,6 +428,21 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('messageHead')">
<if test="conditionParamRef.messageHead != null and conditionParamRef.messageHead != ''">
${_conditionType_} a.messageHead like #{${_conditionParam_}.messageHead}
</if>
<if test="conditionParamRef.messageHead == null">
${_conditionType_} a.messageHead is null
</if>
</if>
<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}
......@@ -550,9 +579,9 @@
<if test='orderCol.deviceId != null and "DESC".equalsIgnoreCase(orderCol.deviceId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('deviceNum')">
a.deviceNum
<if test='orderCol.deviceNum != null and "DESC".equalsIgnoreCase(orderCol.deviceNum)'>DESC</if>
<if test="orderCol.containsKey('deviceCode')">
a.deviceCode
<if test='orderCol.deviceCode != null and "DESC".equalsIgnoreCase(orderCol.deviceCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('deviceName')">
......@@ -560,6 +589,11 @@
<if test='orderCol.deviceName != null and "DESC".equalsIgnoreCase(orderCol.deviceName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('messageHead')">
a.messageHead
<if test='orderCol.messageHead != null and "DESC".equalsIgnoreCase(orderCol.messageHead)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('logType')">
a.logType
<if test='orderCol.logType != null and "DESC".equalsIgnoreCase(orderCol.logType)'>DESC</if>
......
device-manager/src/main/resources/sqlmap/module/device/DeviceModuleMapper.xml
View file @ 84e02b55
......@@ -6,8 +6,8 @@
<!-- 字段和属性映射 -->
<resultMap type="DeviceModuleEntity" id="DeviceModuleEntity-Map">
<id property="id" column="id" />
<result property="moduleId" column="moduleId" />
<result property="deviceId" column="deviceId" />
<result property="moduleName" column="moduleName" />
<result property="moduleMsgCode" column="moduleMsgCode" />
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
......@@ -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')))">
a.id,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('moduleId') or colPickMode == 1 and data.containsKey('moduleId')))">
a.moduleId,
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('moduleName') or colPickMode == 1 and data.containsKey('moduleName')))">
a.moduleName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceId') or colPickMode == 1 and data.containsKey('deviceId')))">
a.deviceId,
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('moduleMsgCode') or colPickMode == 1 and data.containsKey('moduleMsgCode')))">
a.moduleMsgCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime,
......@@ -41,18 +41,18 @@
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="DeviceModuleEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_device_module
(moduleId,deviceId,createTime,updateUserId,updateTime)
(moduleName,moduleMsgCode,createTime,updateUserId,updateTime)
VALUES
(#{moduleId},#{deviceId},#{createTime},#{updateUserId},#{updateTime})
(#{moduleName},#{moduleMsgCode},#{createTime},#{updateUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_device_module
(moduleId,deviceId,createTime,updateUserId,updateTime)
(moduleName,moduleMsgCode,createTime,updateUserId,updateTime)
VALUES
<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>
</insert>
......@@ -62,17 +62,11 @@
update mortals_xhx_device_module as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('moduleId')) or (colPickMode==1 and !data.containsKey('moduleId'))">
a.moduleId=#{data.moduleId},
<if test="(colPickMode==0 and data.containsKey('moduleName')) or (colPickMode==1 and !data.containsKey('moduleName'))">
a.moduleName=#{data.moduleName},
</if>
<if test="(colPickMode==0 and data.containsKey('moduleIdIncrement')) or (colPickMode==1 and !data.containsKey('moduleIdIncrement'))">
a.moduleId=ifnull(a.moduleId,0) + #{data.moduleIdIncrement},
</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 test="(colPickMode==0 and data.containsKey('moduleMsgCode')) or (colPickMode==1 and !data.containsKey('moduleMsgCode'))">
a.moduleMsgCode=#{data.moduleMsgCode},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime},
......@@ -98,28 +92,18 @@
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_device_module as a
<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="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('moduleId')) or (colPickMode==1 and !item.containsKey('moduleId'))">
when a.id=#{item.id} then #{item.moduleId}
</when>
<when test="(colPickMode==0 and item.containsKey('moduleIdIncrement')) or (colPickMode==1 and !item.containsKey('moduleIdIncrement'))">
when a.id=#{item.id} then ifnull(a.moduleId,0) + #{item.moduleIdIncrement}
</when>
</choose>
<if test="(colPickMode==0 and item.containsKey('moduleName')) or (colPickMode==1 and !item.containsKey('moduleName'))">
when a.id=#{item.id} then #{item.moduleName}
</if>
</foreach>
</trim>
<trim prefix="deviceId=(case" suffix="ELSE deviceId end),">
<trim prefix="moduleMsgCode=(case" suffix="ELSE moduleMsgCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('deviceId')) or (colPickMode==1 and !item.containsKey('deviceId'))">
when a.id=#{item.id} then #{item.deviceId}
</when>
<when test="(colPickMode==0 and item.containsKey('deviceIdIncrement')) or (colPickMode==1 and !item.containsKey('deviceIdIncrement'))">
when a.id=#{item.id} then ifnull(a.deviceId,0) + #{item.deviceIdIncrement}
</when>
</choose>
<if test="(colPickMode==0 and item.containsKey('moduleMsgCode')) or (colPickMode==1 and !item.containsKey('moduleMsgCode'))">
when a.id=#{item.id} then #{item.moduleMsgCode}
</if>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),">
......@@ -270,48 +254,36 @@
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('moduleId')">
<if test="conditionParamRef.moduleId != null ">
${_conditionType_} a.moduleId = #{${_conditionParam_}.moduleId}
<if test="conditionParamRef.containsKey('moduleName')">
<if test="conditionParamRef.moduleName != null and conditionParamRef.moduleName != ''">
${_conditionType_} a.moduleName like #{${_conditionParam_}.moduleName}
</if>
<if test="conditionParamRef.moduleId == null">
${_conditionType_} a.moduleId is null
<if test="conditionParamRef.moduleName == null">
${_conditionType_} a.moduleName is null
</if>
</if>
<if test="conditionParamRef.containsKey('moduleIdList')">
${_conditionType_} a.moduleId in
<foreach collection="conditionParamRef.moduleIdList" open="(" close=")" index="index" item="item" separator=",">
<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('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.deviceId != null ">
${_conditionType_} a.deviceId = #{${_conditionParam_}.deviceId}
<if test="conditionParamRef.containsKey('moduleMsgCode')">
<if test="conditionParamRef.moduleMsgCode != null and conditionParamRef.moduleMsgCode != ''">
${_conditionType_} a.moduleMsgCode like #{${_conditionParam_}.moduleMsgCode}
</if>
<if test="conditionParamRef.deviceId == null">
${_conditionType_} a.deviceId is null
<if test="conditionParamRef.moduleMsgCode == null">
${_conditionType_} a.moduleMsgCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('deviceIdList')">
${_conditionType_} a.deviceId in
<foreach collection="conditionParamRef.deviceIdList" open="(" close=")" index="index" item="item" separator=",">
<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('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.createTime != null ">
......@@ -381,14 +353,14 @@
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('moduleId')">
a.moduleId
<if test='orderCol.moduleId != null and "DESC".equalsIgnoreCase(orderCol.moduleId)'>DESC</if>
<if test="orderCol.containsKey('moduleName')">
a.moduleName
<if test='orderCol.moduleName != null and "DESC".equalsIgnoreCase(orderCol.moduleName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('deviceId')">
a.deviceId
<if test='orderCol.deviceId != null and "DESC".equalsIgnoreCase(orderCol.deviceId)'>DESC</if>
<if test="orderCol.containsKey('moduleMsgCode')">
a.moduleMsgCode
<if test='orderCol.moduleMsgCode != null and "DESC".equalsIgnoreCase(orderCol.moduleMsgCode)'>DESC</if>
,
</if>
<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"?>
<!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">
<!-- 字段和属性映射 -->
<resultMap type="DeviceModuleUseEntity" id="DeviceModuleUseEntity-Map">
<id property="id" column="id" />
<result property="moduleId" column="moduleId" />
<result property="moduleName" column="moduleName" />
<result property="moduleMsgCode" column="moduleMsgCode" />
<result property="deviceId" column="deviceId" />
<result property="useNum" column="useNum" />
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
......@@ -21,8 +23,14 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('moduleId') or colPickMode == 1 and data.containsKey('moduleId')))">
a.moduleId,
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('moduleName') or colPickMode == 1 and data.containsKey('moduleName')))">
a.moduleName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('moduleMsgCode') or colPickMode == 1 and data.containsKey('moduleMsgCode')))">
a.moduleMsgCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceId') or colPickMode == 1 and data.containsKey('deviceId')))">
a.deviceId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('useNum') or colPickMode == 1 and data.containsKey('useNum')))">
a.useNum,
......@@ -41,18 +49,18 @@
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="DeviceModuleUseEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_device_module_use
(moduleId,useNum,createTime,updateUserId,updateTime)
(moduleName,moduleMsgCode,deviceId,useNum,createTime,updateUserId,updateTime)
VALUES
(#{moduleId},#{useNum},#{createTime},#{updateUserId},#{updateTime})
(#{moduleName},#{moduleMsgCode},#{deviceId},#{useNum},#{createTime},#{updateUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_device_module_use
(moduleId,useNum,createTime,updateUserId,updateTime)
(moduleName,moduleMsgCode,deviceId,useNum,createTime,updateUserId,updateTime)
VALUES
<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>
</insert>
......@@ -62,11 +70,17 @@
update mortals_xhx_device_module_use as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('moduleId')) or (colPickMode==1 and !data.containsKey('moduleId'))">
a.moduleId=#{data.moduleId},
<if test="(colPickMode==0 and data.containsKey('moduleName')) or (colPickMode==1 and !data.containsKey('moduleName'))">
a.moduleName=#{data.moduleName},
</if>
<if test="(colPickMode==0 and data.containsKey('moduleMsgCode')) or (colPickMode==1 and !data.containsKey('moduleMsgCode'))">
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('moduleIdIncrement')) or (colPickMode==1 and !data.containsKey('moduleIdIncrement'))">
a.moduleId=ifnull(a.moduleId,0) + #{data.moduleIdIncrement},
<if test="(colPickMode==0 and data.containsKey('deviceIdIncrement')) or (colPickMode==1 and !data.containsKey('deviceIdIncrement'))">
a.deviceId=ifnull(a.deviceId,0) + #{data.deviceIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('useNum')) or (colPickMode==1 and !data.containsKey('useNum'))">
a.useNum=#{data.useNum},
......@@ -98,14 +112,28 @@
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_device_module_use as a
<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="" >
<if test="(colPickMode==0 and item.containsKey('moduleName')) or (colPickMode==1 and !item.containsKey('moduleName'))">
when a.id=#{item.id} then #{item.moduleName}
</if>
</foreach>
</trim>
<trim prefix="moduleMsgCode=(case" suffix="ELSE moduleMsgCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('moduleMsgCode')) or (colPickMode==1 and !item.containsKey('moduleMsgCode'))">
when a.id=#{item.id} then #{item.moduleMsgCode}
</if>
</foreach>
</trim>
<trim prefix="deviceId=(case" suffix="ELSE deviceId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('moduleId')) or (colPickMode==1 and !item.containsKey('moduleId'))">
when a.id=#{item.id} then #{item.moduleId}
<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('moduleIdIncrement')) or (colPickMode==1 and !item.containsKey('moduleIdIncrement'))">
when a.id=#{item.id} then ifnull(a.moduleId,0) + #{item.moduleIdIncrement}
<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>
......@@ -270,25 +298,55 @@
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('moduleId')">
<if test="conditionParamRef.moduleId != null ">
${_conditionType_} a.moduleId = #{${_conditionParam_}.moduleId}
<if test="conditionParamRef.containsKey('moduleName')">
<if test="conditionParamRef.moduleName != null and conditionParamRef.moduleName != ''">
${_conditionType_} a.moduleName like #{${_conditionParam_}.moduleName}
</if>
<if test="conditionParamRef.moduleName == null">
${_conditionType_} a.moduleName is null
</if>
</if>
<if test="conditionParamRef.containsKey('moduleNameList')">
${_conditionType_} a.moduleName in
<foreach collection="conditionParamRef.moduleNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('moduleMsgCode')">
<if test="conditionParamRef.moduleMsgCode != null and conditionParamRef.moduleMsgCode != ''">
${_conditionType_} a.moduleMsgCode like #{${_conditionParam_}.moduleMsgCode}
</if>
<if test="conditionParamRef.moduleId == null">
${_conditionType_} a.moduleId is null
<if test="conditionParamRef.moduleMsgCode == null">
${_conditionType_} a.moduleMsgCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('moduleIdList')">
${_conditionType_} a.moduleId in
<foreach collection="conditionParamRef.moduleIdList" open="(" close=")" index="index" item="item" separator=",">
<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('moduleIdStart') and conditionParamRef.moduleIdStart != null">
${_conditionType_} a.moduleId <![CDATA[ >= ]]> #{${_conditionParam_}.moduleIdStart}
<if test="conditionParamRef.containsKey('deviceId')">
<if test="conditionParamRef.deviceId != null ">
${_conditionType_} a.deviceId = #{${_conditionParam_}.deviceId}
</if>
<if test="conditionParamRef.deviceId == null">
${_conditionType_} a.deviceId is null
</if>
<if test="conditionParamRef.containsKey('moduleIdEnd') and conditionParamRef.moduleIdEnd != null">
${_conditionType_} a.moduleId <![CDATA[ <= ]]> #{${_conditionParam_}.moduleIdEnd}
</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')">
......@@ -381,9 +439,19 @@
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('moduleId')">
a.moduleId
<if test='orderCol.moduleId != null and "DESC".equalsIgnoreCase(orderCol.moduleId)'>DESC</if>
<if test="orderCol.containsKey('moduleName')">
a.moduleName
<if test='orderCol.moduleName != null and "DESC".equalsIgnoreCase(orderCol.moduleName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('moduleMsgCode')">
a.moduleMsgCode
<if test='orderCol.moduleMsgCode != null and "DESC".equalsIgnoreCase(orderCol.moduleMsgCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('deviceId')">
a.deviceId
<if test='orderCol.deviceId != null and "DESC".equalsIgnoreCase(orderCol.deviceId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('useNum')">
......
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