Skip to content

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

物联网1.0

parent 84e02b55
Hide whitespace changes
Inline Side-by-side
Showing with 1136 additions and 887 deletions
db/module.sql
View file @ 517e7875
...@@ -166,12 +166,15 @@ CREATE TABLE mortals_xhx_alarm_config( ...@@ -166,12 +166,15 @@ CREATE TABLE mortals_xhx_alarm_config(
`alarmLevel` tinyint(2) NOT NULL COMMENT '告警级别,(0.危险，1.次要，2.一般)', `alarmLevel` tinyint(2) NOT NULL COMMENT '告警级别,(0.危险，1.次要，2.一般)',
`alarmPusW1ay` tinyint(2) NOT NULL COMMENT '推送方式,(0.不推送，1.短信)', `alarmPusW1ay` tinyint(2) NOT NULL COMMENT '推送方式,(0.不推送，1.短信)',
`isUse` tinyint(2) NOT NULL COMMENT '是否启用(0.不启动，1.启动)', `isUse` tinyint(2) NOT NULL COMMENT '是否启用(0.不启动，1.启动)',
`remark` varchar(2048) COMMENT '备注',
`createTime` datetime NOT NULL COMMENT '创建时间', `createTime` datetime NOT NULL 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='设备告警配置';
-- ---------------------------- -- ----------------------------
-- 短信发送记录表 -- 短信发送记录表
-- ---------------------------- -- ----------------------------
......
device-manager-ui/admin/src/assets/mixins/formdialog.js
View file @ 517e7875
...@@ -23,6 +23,14 @@ export default { ...@@ -23,6 +23,14 @@ export default {
this.$router.go(-1); this.$router.go(-1);
}, },
// 开启、关闭
changePath(path) {
this.pageInfo.list = path + "/list";
this.pageInfo.del = path + "/delete";
this.pageInfo.add = path + "/add";
this.pageInfo.edit = path + "/edit";
this.pageInfo.view = path + "/view";
},
// 默认拉取数据 // 默认拉取数据
getData() { getData() {
......
device-manager-ui/admin/src/assets/mixins/table.js
View file @ 517e7875
...@@ -14,8 +14,7 @@ export default { ...@@ -14,8 +14,7 @@ export default {
}, },
watch: { watch: {
'$route'(route) { '$route'(route) {
// this.query = Object.assign({}, this.query, route.query); // this.query = Object.assign({}, this.query, route.query);
this.getData(); this.getData();
} }
}, },
...@@ -24,6 +23,17 @@ export default { ...@@ -24,6 +23,17 @@ export default {
clearTimeout(this.loadingTimer); clearTimeout(this.loadingTimer);
}, },
methods: { methods: {
test(){
console.log("test")
},
// 开启、关闭
changePath(path) {
this.pageInfo.list = path + "/list";
this.pageInfo.del = path + "/delete";
this.pageInfo.add = path + "/add";
this.pageInfo.edit = path + "/edit";
this.pageInfo.view = path + "/view";
},
beforeFecth() { beforeFecth() {
return Promise.resolve(); return Promise.resolve();
}, },
...@@ -242,7 +252,7 @@ export default { ...@@ -242,7 +252,7 @@ export default {
return this.$message.warning('请选中一条记录'); return this.$message.warning('请选中一条记录');
} }
this.$get(this.pageInfo.del, {id: id}) this.$get(this.pageInfo.del, { id: id })
.then(res => { .then(res => {
this.$message.success(res.msg) this.$message.success(res.msg)
// 更新数据 // 更新数据
...@@ -299,13 +309,13 @@ export default { ...@@ -299,13 +309,13 @@ export default {
open() { open() {
}, },
}, },
computed: { computed: {
tableConfig() { tableConfig() {
return Object.assign({}, this.defaultConfig, this.config) return Object.assign({}, this.defaultConfig, this.config)
}, },
pageInfo() { pageInfo() {
console.log(3333333+this.$route.path)
const urls = { // 操作所需的url地址，和url同路径 const urls = { // 操作所需的url地址，和url同路径
list: this.$route.path, list: this.$route.path,
edit: this.$route.path.replace('/list', '/edit'), edit: this.$route.path.replace('/list', '/edit'),
......
device-manager-ui/admin/src/components/Table.vue
View file @ 517e7875
...@@ -111,6 +111,7 @@ ...@@ -111,6 +111,7 @@
<slot name="table-search-left"></slot> <slot name="table-search-left"></slot>
<SearchForm <SearchForm
:search="config.search" :search="config.search"
v-if="isShowButton('notSearch')"
:table="data" :table="data"
:downloadUrl="config.downloadUrl" :downloadUrl="config.downloadUrl"
:areaSelect="config.areaSelect" :areaSelect="config.areaSelect"
...@@ -190,7 +191,7 @@ ...@@ -190,7 +191,7 @@
class="table-foot" class="table-foot"
v-if="!isShowButton('notPagination') ? false : data.pageInfo.totalResult" v-if="!isShowButton('notPagination') ? false : data.pageInfo.totalResult"
> >
<Pagination <Pagination style="float:left"
:total="data.pageInfo.totalResult" :total="data.pageInfo.totalResult"
:prePageResult="data.pageInfo.prePageResult" :prePageResult="data.pageInfo.prePageResult"
/> />
......
device-manager-ui/admin/src/views/alarm/config/list.vue
View file @ 517e7875
...@@ -3,17 +3,19 @@ ...@@ -3,17 +3,19 @@
<LayoutTable :data="tableData" :config="tableConfig"> <LayoutTable :data="tableData" :config="tableConfig">
</LayoutTable> </LayoutTable>
<dialog-show ref="dialogform" @ok="getData" /> <!-- <dialog-show ref="dialogform" @ok="getData" /> -->
<drawer-show ref="drawerform" @ok="getData" />
</div> </div>
</template> </template>
<script> <script>
/** 表单弹出框模式需引入 */ /** 表单弹出框模式需引入 */
import dialogShow from "./dialogshow"; import drawerShow from "./drawershow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
export default { export default {
name: "AlarmConfig", name: "AlarmConfig",
components: {dialogShow }, components: {drawerShow },
mixins: [table], mixins: [table],
created() { created() {
}, },
...@@ -21,7 +23,9 @@ ...@@ -21,7 +23,9 @@
/** 重写新增方法 */ /** 重写新增方法 */
toAdd(row) { toAdd(row) {
this.$refs.dialogform.add(row); //this.$refs.dialogform.add(row);
this.$refs.drawerform.add(row);
}, },
/** 重写编辑方法 */ /** 重写编辑方法 */
toEdit(row) { toEdit(row) {
......
device-manager-ui/admin/src/views/device/alarm/info/list.vue
View file @ 517e7875
...@@ -32,13 +32,13 @@ export default { ...@@ -32,13 +32,13 @@ export default {
console.log("pageInfo--before",this.pageInfo) console.log("pageInfo--before",this.pageInfo)
// this.changePath("/device/alarm/info") this.changePath("/device/alarm/info")
this.pageInfo.list = "/device/alarm/info/list"; // this.pageInfo.list = "/device/alarm/info/list";
this.pageInfo.del = "/device/alarm/info/delete"; // this.pageInfo.del = "/device/alarm/info/delete";
this.pageInfo.add = "/device/alarm/info/add"; // this.pageInfo.add = "/device/alarm/info/add";
this.pageInfo.edit = "/device/alarm/info/edit"; // this.pageInfo.edit = "/device/alarm/info/edit";
this.pageInfo.view = "/device/alarm/info/view"; // this.pageInfo.view = "/device/alarm/info/view";
console.log("pageInfo",this.pageInfo) console.log("pageInfo",this.pageInfo)
......
device-manager-ui/admin/src/views/device/drawerview.vue
View file @ 517e7875
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
import form from "@/assets/mixins/formdialog"; import form from "@/assets/mixins/formdialog";
import viewShow from "./view"; import viewShow from "./view";
import alarmList from "./alarm/info/list"; import alarmList from "./alarm/info/list";
import moduleList from "./module/list"; import moduleList from "./module/use/list";
import ImageUpload from "@/components/ImageUpload"; import ImageUpload from "@/components/ImageUpload";
export default { export default {
mixins: [form], mixins: [form],
......
device-manager-ui/admin/src/views/device/list.vue
View file @ 517e7875
...@@ -31,23 +31,26 @@ ...@@ -31,23 +31,26 @@
:disabled="isExport" :disabled="isExport"
>导出</el-button >导出</el-button
> >
<el-tag slot="table-body-head" style="margin: 5px" type="success" <el-tag slot="table-head-left2" size="mini" style="margin-left: 20px"
>当前在线设备总计：{{ tableData.onlineCount }}个</el-tag >设备总数：{{ tableData.totalCount }}台</el-tag
> >
<el-tag slot="table-body-head" style="margin: 5px" type="danger" <el-tag slot="table-head-left2" size="mini" style="margin: 5px" type="success"
>当前离线设备总计：{{ tableData.offlineCount }}个</el-tag >在线：{{ tableData.onlineCount }}台</el-tag
> >
<el-tag <el-tag slot="table-head-left2" size="mini" style="margin: 5px" type="danger"
v-for="($label, $value) in tableData.offlineDeviceType" >离线：{{ tableData.offlineCount }}台</el-tag
:key="$value"
:label="$value"
slot="table-body-head"
style="margin: 5px"
type="danger"
>{{ $value }}离线设备：{{ $label }}个</el-tag
> >
<el-tag slot="table-head-left2" size="mini" style="margin: 5px" type="danger"
>停用：{{ tableData.stopCount }}台</el-tag
>
<el-tag slot="table-head-left2" size="mini" style="margin: 5px" type="danger"
>未激活：{{ tableData.unActiveCount }}台</el-tag
>
</LayoutTable> </LayoutTable>
<!-- 设备导入对话框 --> <!-- 设备导入对话框 -->
...@@ -268,29 +271,29 @@ export default { ...@@ -268,29 +271,29 @@ export default {
config: { config: {
getsocketData: null, getsocketData: null,
search: [ search: [
{ // {
name: "deviceNum", // name: "deviceNum",
type: "text", // type: "text",
label: "设备编号", // label: "设备编号",
}, // },
{ {
name: "deviceStatus", name: "deviceStatus",
type: "select", type: "select",
label: "状态", label: "状态",
}, },
{ // {
name: "porductId", // name: "porductId",
type: "select", // type: "select",
label: "产品类型", // label: "产品类型",
}, // },
], ],
columns: [ columns: [
{ type: "selection", width: 60 }, { type: "selection", width: 60 },
{ label: "设备名称", prop: "deviceName" }, { label: "设备名称", prop: "deviceName" },
{ label: "设备类型", prop: "porductId", formatter: this.formatter }, { label: "设备类型", prop: "productId", formatter: this.formatter },
{ label: "设备编码", prop: "deviceCode" }, { label: "设备编码", prop: "deviceCode" },
......
device-manager-ui/admin/src/views/device/module/use/list.vue
View file @ 517e7875
<template> <template>
<div class="page"> <div class="page">
<LayoutTable :data="tableData" :config="tableConfig"> <LayoutTable
</LayoutTable> :data="tableData"
notAdd
notDel
notSearch
:config="tableConfig"
>
</LayoutTable>
<dialog-show ref="dialogform" @ok="getData" /> <dialog-show ref="dialogform" @ok="getData" />
</div> </div>
</template> </template>
<script> <script>
/** 表单弹出框模式需引入 */ /** 表单弹出框模式需引入 */
import dialogShow from "./dialogshow"; import dialogShow from "./dialogshow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
export default { export default {
name: "DeviceModuleUse", name: "DeviceModuleUse",
components: {dialogShow }, props: {
mixins: [table], queryIn: {
created() { type: Object,
}, default: null,
methods: { },
},
/** 重写新增方法 */ components: { dialogShow },
toAdd(row) { mixins: [table],
this.$refs.dialogform.add(row); created() {
}, console.log("queryIn:", this.queryIn);
/** 重写编辑方法 */
toEdit(row) { //this.config.addQuery = { deviceId, deviceType };
this.$refs.dialogform.edit(row);
if (this.queryIn.deviceId) {
}, this.query = {};
/** 重写查看方法 */ this.query["deviceId"] = this.queryIn.deviceId;
// toView(row) { }
// this.$refs.dialogform.view(row);
// }, console.log("pageInfo--before", this.pageInfo);
}, // this.changePath("/device/alarm/info")
data() {
return { this.pageInfo.list = "/device/module/use/list";
config: { this.pageInfo.del = "/device/module/use/delete";
search: [ this.pageInfo.add = "/device/module/use/add";
], this.pageInfo.edit = "/device/module/use/edit";
columns: [ this.pageInfo.view = "/device/module/use/view";
{type: "selection", width: 60},
{ console.log("pageInfo", this.pageInfo);
label: "操作", },
width: 240, methods: {
formatter: row => { /** 重写新增方法 */
return ( toAdd(row) {
<table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} /> this.$refs.dialogform.add(row);
); },
} /** 重写编辑方法 */
} toEdit(row) {
] this.$refs.dialogform.edit(row);
} },
}; /** 重写查看方法 */
} // toView(row) {
// this.$refs.dialogform.view(row);
// },
},
data() {
return {
config: {
search: [],
columns: [
{ label: "模块名称", prop: "moduleName" },
// { label: "模块消息编码", prop: "moduleMsgCode" },
{
label: "设备名称",
prop: "deviceId",
formatter: this.formatterString,
},
{ label: "产品名称", prop: "platformAndProductName" },
{ label: "调用次数", prop: "useNum" },
],
},
}; };
},
};
</script> </script>
\ No newline at end of file
device-manager-ui/admin/src/views/device/view.vue
View file @ 517e7875
...@@ -148,7 +148,9 @@ ...@@ -148,7 +148,9 @@
label-class-name="labelClass" label-class-name="labelClass"
content-class-name="contentClass" content-class-name="contentClass"
> >
{{ form.devicePhotoPath }}
<ImageUpload v-model="form.devicePhotoPath" prePath="/file/preview" />
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item <el-descriptions-item
......
device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
View file @ 517e7875
...@@ -145,6 +145,7 @@ public class DeviceApiController { ...@@ -145,6 +145,7 @@ public class DeviceApiController {
ServerInfo serverInfo = new ServerInfo(); ServerInfo serverInfo = new ServerInfo();
serverInfo.setHomeUrl(platformEntity.getHomeUrl()); serverInfo.setHomeUrl(platformEntity.getHomeUrl());
serverInfo.setServerUrl(platformEntity.getSendUrl()); serverInfo.setServerUrl(platformEntity.getSendUrl());
registerResp.setServiceInfo(serverInfo);
String content = EncryptUtil.myEnscrt(JSON.toJSONString(registerResp), 9, DES_STR, ENCRYPT_STR); String content = EncryptUtil.myEnscrt(JSON.toJSONString(registerResp), 9, DES_STR, ENCRYPT_STR);
deviceResp.setContent(content); deviceResp.setContent(content);
......
device-manager/src/main/java/com/mortals/xhx/module/alarm/model/AlarmConfigEntity.java
View file @ 517e7875
...@@ -7,116 +7,134 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,116 +7,134 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.alarm.model.vo.AlarmConfigVo; import com.mortals.xhx.module.alarm.model.vo.AlarmConfigVo;
/** /**
* 设备告警配置实体对象 * 设备告警配置实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-07-01 * @date 2022-07-04
*/ */
public class AlarmConfigEntity extends AlarmConfigVo { public class AlarmConfigEntity extends AlarmConfigVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 产品 * 产品
*/ */
private Long productId; private Long productId;
/** /**
* 告警类型(0.离线) * 告警类型(0.离线)
*/ */
private Integer alarmType; private Integer alarmType;
/** /**
* 告警级别,(0.危险，1.次要，2.一般) * 告警级别,(0.危险，1.次要，2.一般)
*/ */
private Integer alarmLevel; private Integer alarmLevel;
/** /**
* 推送方式,(0.不推送，1.短信) * 推送方式,(0.不推送，1.短信)
*/ */
private Integer alarmPusW1ay; private Integer alarmPusW1ay;
/** /**
* 是否启用(0.不启动，1.启动) * 是否启用(0.不启动，1.启动)
*/ */
private Integer isUse; private Integer isUse;
/**
* 备注
*/
private String remark;
public AlarmConfigEntity(){} public AlarmConfigEntity(){}
/** /**
* 获取 产品 * 获取 产品
* @return Long * @return Long
*/ */
public Long getProductId(){ public Long getProductId(){
return productId; return productId;
} }
/** /**
* 设置 产品 * 设置 产品
* @param productId * @param productId
*/ */
public void setProductId(Long productId){ public void setProductId(Long productId){
this.productId = productId; this.productId = productId;
} }
/** /**
* 获取 告警类型(0.离线) * 获取 告警类型(0.离线)
* @return Integer * @return Integer
*/ */
public Integer getAlarmType(){ public Integer getAlarmType(){
return alarmType; return alarmType;
} }
/** /**
* 设置 告警类型(0.离线) * 设置 告警类型(0.离线)
* @param alarmType * @param alarmType
*/ */
public void setAlarmType(Integer alarmType){ public void setAlarmType(Integer alarmType){
this.alarmType = alarmType; this.alarmType = alarmType;
} }
/** /**
* 获取 告警级别,(0.危险，1.次要，2.一般) * 获取 告警级别,(0.危险，1.次要，2.一般)
* @return Integer * @return Integer
*/ */
public Integer getAlarmLevel(){ public Integer getAlarmLevel(){
return alarmLevel; return alarmLevel;
} }
/** /**
* 设置 告警级别,(0.危险，1.次要，2.一般) * 设置 告警级别,(0.危险，1.次要，2.一般)
* @param alarmLevel * @param alarmLevel
*/ */
public void setAlarmLevel(Integer alarmLevel){ public void setAlarmLevel(Integer alarmLevel){
this.alarmLevel = alarmLevel; this.alarmLevel = alarmLevel;
} }
/** /**
* 获取 推送方式,(0.不推送，1.短信) * 获取 推送方式,(0.不推送，1.短信)
* @return Integer * @return Integer
*/ */
public Integer getAlarmPusW1ay(){ public Integer getAlarmPusW1ay(){
return alarmPusW1ay; return alarmPusW1ay;
} }
/** /**
* 设置 推送方式,(0.不推送，1.短信) * 设置 推送方式,(0.不推送，1.短信)
* @param alarmPusW1ay * @param alarmPusW1ay
*/ */
public void setAlarmPusW1ay(Integer alarmPusW1ay){ public void setAlarmPusW1ay(Integer alarmPusW1ay){
this.alarmPusW1ay = alarmPusW1ay; this.alarmPusW1ay = alarmPusW1ay;
} }
/** /**
* 获取 是否启用(0.不启动，1.启动) * 获取 是否启用(0.不启动，1.启动)
* @return Integer * @return Integer
*/ */
public Integer getIsUse(){ public Integer getIsUse(){
return isUse; return isUse;
} }
/** /**
* 设置 是否启用(0.不启动，1.启动) * 设置 是否启用(0.不启动，1.启动)
* @param isUse * @param isUse
*/ */
public void setIsUse(Integer isUse){ public void setIsUse(Integer isUse){
this.isUse = isUse; this.isUse = isUse;
} }
/**
* 获取 备注
* @return String
*/
public String getRemark(){
return remark;
}
/**
* 设置 备注
* @param remark
*/
public void setRemark(String remark){
this.remark = remark;
}
@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) {
...@@ -124,7 +142,7 @@ public class AlarmConfigEntity extends AlarmConfigVo { ...@@ -124,7 +142,7 @@ public class AlarmConfigEntity extends AlarmConfigVo {
if (obj instanceof AlarmConfigEntity) { if (obj instanceof AlarmConfigEntity) {
AlarmConfigEntity tmp = (AlarmConfigEntity) obj; AlarmConfigEntity tmp = (AlarmConfigEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
...@@ -137,19 +155,22 @@ public class AlarmConfigEntity extends AlarmConfigVo { ...@@ -137,19 +155,22 @@ public class AlarmConfigEntity extends AlarmConfigVo {
sb.append(",alarmLevel:").append(getAlarmLevel()); sb.append(",alarmLevel:").append(getAlarmLevel());
sb.append(",alarmPusW1ay:").append(getAlarmPusW1ay()); sb.append(",alarmPusW1ay:").append(getAlarmPusW1ay());
sb.append(",isUse:").append(getIsUse()); sb.append(",isUse:").append(getIsUse());
sb.append(",remark:").append(getRemark());
return sb.toString(); return sb.toString();
} }
public void initAttrValue(){ public void initAttrValue(){
this.productId = null; this.productId = null;
this.alarmType = 0;
this.alarmType = 0; this.alarmLevel = null;
this.alarmLevel = null; this.alarmPusW1ay = 0;
this.alarmPusW1ay = 0; this.isUse = null;
this.isUse = null; this.remark = "";
} }
} }
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/alarm/model/AlarmConfigQuery.java
View file @ 517e7875
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.alarm.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.alarm.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.alarm.model.AlarmConfigEntity; import com.mortals.xhx.module.alarm.model.AlarmConfigEntity;
/** /**
* 设备告警配置查询对象 * 设备告警配置查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-07-01 * @date 2022-07-04
*/ */
public class AlarmConfigQuery extends AlarmConfigEntity { public class AlarmConfigQuery extends AlarmConfigEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -81,6 +81,9 @@ public class AlarmConfigQuery extends AlarmConfigEntity { ...@@ -81,6 +81,9 @@ public class AlarmConfigQuery extends AlarmConfigEntity {
/** 是否启用(0.不启动，1.启动)列表 */ /** 是否启用(0.不启动，1.启动)列表 */
private List <Integer> isUseList; private List <Integer> isUseList;
/** 备注 */
private List<String> remarkList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -114,862 +117,896 @@ public class AlarmConfigQuery extends AlarmConfigEntity { ...@@ -114,862 +117,896 @@ public class AlarmConfigQuery extends AlarmConfigEntity {
public AlarmConfigQuery(){} public AlarmConfigQuery(){}
/** /**
* 获取 开始 主键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;
} }
/** /**
* 获取 开始 产品 * 获取 开始 产品
* @return productIdStart * @return productIdStart
*/ */
public Long getProductIdStart(){ public Long getProductIdStart(){
return this.productIdStart; return this.productIdStart;
} }
/** /**
* 设置 开始 产品 * 设置 开始 产品
* @param productIdStart * @param productIdStart
*/ */
public void setProductIdStart(Long productIdStart){ public void setProductIdStart(Long productIdStart){
this.productIdStart = productIdStart; this.productIdStart = productIdStart;
} }
/** /**
* 获取 结束 产品 * 获取 结束 产品
* @return $productIdEnd * @return $productIdEnd
*/ */
public Long getProductIdEnd(){ public Long getProductIdEnd(){
return this.productIdEnd; return this.productIdEnd;
} }
/** /**
* 设置 结束 产品 * 设置 结束 产品
* @param productIdEnd * @param productIdEnd
*/ */
public void setProductIdEnd(Long productIdEnd){ public void setProductIdEnd(Long productIdEnd){
this.productIdEnd = productIdEnd; this.productIdEnd = productIdEnd;
} }
/** /**
* 获取 增加 产品 * 获取 增加 产品
* @return productIdIncrement * @return productIdIncrement
*/ */
public Long getProductIdIncrement(){ public Long getProductIdIncrement(){
return this.productIdIncrement; return this.productIdIncrement;
} }
/** /**
* 设置 增加 产品 * 设置 增加 产品
* @param productIdIncrement * @param productIdIncrement
*/ */
public void setProductIdIncrement(Long productIdIncrement){ public void setProductIdIncrement(Long productIdIncrement){
this.productIdIncrement = productIdIncrement; this.productIdIncrement = productIdIncrement;
} }
/** /**
* 获取 产品 * 获取 产品
* @return productIdList * @return productIdList
*/ */
public List<Long> getProductIdList(){ public List<Long> getProductIdList(){
return this.productIdList; return this.productIdList;
} }
/** /**
* 设置 产品 * 设置 产品
* @param productIdList * @param productIdList
*/ */
public void setProductIdList(List<Long> productIdList){ public void setProductIdList(List<Long> productIdList){
this.productIdList = productIdList; this.productIdList = productIdList;
} }
/** /**
* 获取 开始 告警类型(0.离线) * 获取 开始 告警类型(0.离线)
* @return alarmTypeStart * @return alarmTypeStart
*/ */
public Integer getAlarmTypeStart(){ public Integer getAlarmTypeStart(){
return this.alarmTypeStart; return this.alarmTypeStart;
} }
/** /**
* 设置 开始 告警类型(0.离线) * 设置 开始 告警类型(0.离线)
* @param alarmTypeStart * @param alarmTypeStart
*/ */
public void setAlarmTypeStart(Integer alarmTypeStart){ public void setAlarmTypeStart(Integer alarmTypeStart){
this.alarmTypeStart = alarmTypeStart; this.alarmTypeStart = alarmTypeStart;
} }
/** /**
* 获取 结束 告警类型(0.离线) * 获取 结束 告警类型(0.离线)
* @return $alarmTypeEnd * @return $alarmTypeEnd
*/ */
public Integer getAlarmTypeEnd(){ public Integer getAlarmTypeEnd(){
return this.alarmTypeEnd; return this.alarmTypeEnd;
} }
/** /**
* 设置 结束 告警类型(0.离线) * 设置 结束 告警类型(0.离线)
* @param alarmTypeEnd * @param alarmTypeEnd
*/ */
public void setAlarmTypeEnd(Integer alarmTypeEnd){ public void setAlarmTypeEnd(Integer alarmTypeEnd){
this.alarmTypeEnd = alarmTypeEnd; this.alarmTypeEnd = alarmTypeEnd;
} }
/** /**
* 获取 增加 告警类型(0.离线) * 获取 增加 告警类型(0.离线)
* @return alarmTypeIncrement * @return alarmTypeIncrement
*/ */
public Integer getAlarmTypeIncrement(){ public Integer getAlarmTypeIncrement(){
return this.alarmTypeIncrement; return this.alarmTypeIncrement;
} }
/** /**
* 设置 增加 告警类型(0.离线) * 设置 增加 告警类型(0.离线)
* @param alarmTypeIncrement * @param alarmTypeIncrement
*/ */
public void setAlarmTypeIncrement(Integer alarmTypeIncrement){ public void setAlarmTypeIncrement(Integer alarmTypeIncrement){
this.alarmTypeIncrement = alarmTypeIncrement; this.alarmTypeIncrement = alarmTypeIncrement;
} }
/** /**
* 获取 告警类型(0.离线) * 获取 告警类型(0.离线)
* @return alarmTypeList * @return alarmTypeList
*/ */
public List<Integer> getAlarmTypeList(){ public List<Integer> getAlarmTypeList(){
return this.alarmTypeList; return this.alarmTypeList;
} }
/** /**
* 设置 告警类型(0.离线) * 设置 告警类型(0.离线)
* @param alarmTypeList * @param alarmTypeList
*/ */
public void setAlarmTypeList(List<Integer> alarmTypeList){ public void setAlarmTypeList(List<Integer> alarmTypeList){
this.alarmTypeList = alarmTypeList; this.alarmTypeList = alarmTypeList;
} }
/** /**
* 获取 开始 告警级别,(0.危险，1.次要，2.一般) * 获取 开始 告警级别,(0.危险，1.次要，2.一般)
* @return alarmLevelStart * @return alarmLevelStart
*/ */
public Integer getAlarmLevelStart(){ public Integer getAlarmLevelStart(){
return this.alarmLevelStart; return this.alarmLevelStart;
} }
/** /**
* 设置 开始 告警级别,(0.危险，1.次要，2.一般) * 设置 开始 告警级别,(0.危险，1.次要，2.一般)
* @param alarmLevelStart * @param alarmLevelStart
*/ */
public void setAlarmLevelStart(Integer alarmLevelStart){ public void setAlarmLevelStart(Integer alarmLevelStart){
this.alarmLevelStart = alarmLevelStart; this.alarmLevelStart = alarmLevelStart;
} }
/** /**
* 获取 结束 告警级别,(0.危险，1.次要，2.一般) * 获取 结束 告警级别,(0.危险，1.次要，2.一般)
* @return $alarmLevelEnd * @return $alarmLevelEnd
*/ */
public Integer getAlarmLevelEnd(){ public Integer getAlarmLevelEnd(){
return this.alarmLevelEnd; return this.alarmLevelEnd;
} }
/** /**
* 设置 结束 告警级别,(0.危险，1.次要，2.一般) * 设置 结束 告警级别,(0.危险，1.次要，2.一般)
* @param alarmLevelEnd * @param alarmLevelEnd
*/ */
public void setAlarmLevelEnd(Integer alarmLevelEnd){ public void setAlarmLevelEnd(Integer alarmLevelEnd){
this.alarmLevelEnd = alarmLevelEnd; this.alarmLevelEnd = alarmLevelEnd;
} }
/** /**
* 获取 增加 告警级别,(0.危险，1.次要，2.一般) * 获取 增加 告警级别,(0.危险，1.次要，2.一般)
* @return alarmLevelIncrement * @return alarmLevelIncrement
*/ */
public Integer getAlarmLevelIncrement(){ public Integer getAlarmLevelIncrement(){
return this.alarmLevelIncrement; return this.alarmLevelIncrement;
} }
/** /**
* 设置 增加 告警级别,(0.危险，1.次要，2.一般) * 设置 增加 告警级别,(0.危险，1.次要，2.一般)
* @param alarmLevelIncrement * @param alarmLevelIncrement
*/ */
public void setAlarmLevelIncrement(Integer alarmLevelIncrement){ public void setAlarmLevelIncrement(Integer alarmLevelIncrement){
this.alarmLevelIncrement = alarmLevelIncrement; this.alarmLevelIncrement = alarmLevelIncrement;
} }
/** /**
* 获取 告警级别,(0.危险，1.次要，2.一般) * 获取 告警级别,(0.危险，1.次要，2.一般)
* @return alarmLevelList * @return alarmLevelList
*/ */
public List<Integer> getAlarmLevelList(){ public List<Integer> getAlarmLevelList(){
return this.alarmLevelList; return this.alarmLevelList;
} }
/** /**
* 设置 告警级别,(0.危险，1.次要，2.一般) * 设置 告警级别,(0.危险，1.次要，2.一般)
* @param alarmLevelList * @param alarmLevelList
*/ */
public void setAlarmLevelList(List<Integer> alarmLevelList){ public void setAlarmLevelList(List<Integer> alarmLevelList){
this.alarmLevelList = alarmLevelList; this.alarmLevelList = alarmLevelList;
} }
/** /**
* 获取 开始 推送方式,(0.不推送，1.短信) * 获取 开始 推送方式,(0.不推送，1.短信)
* @return alarmPusW1ayStart * @return alarmPusW1ayStart
*/ */
public Integer getAlarmPusW1ayStart(){ public Integer getAlarmPusW1ayStart(){
return this.alarmPusW1ayStart; return this.alarmPusW1ayStart;
} }
/** /**
* 设置 开始 推送方式,(0.不推送，1.短信) * 设置 开始 推送方式,(0.不推送，1.短信)
* @param alarmPusW1ayStart * @param alarmPusW1ayStart
*/ */
public void setAlarmPusW1ayStart(Integer alarmPusW1ayStart){ public void setAlarmPusW1ayStart(Integer alarmPusW1ayStart){
this.alarmPusW1ayStart = alarmPusW1ayStart; this.alarmPusW1ayStart = alarmPusW1ayStart;
} }
/** /**
* 获取 结束 推送方式,(0.不推送，1.短信) * 获取 结束 推送方式,(0.不推送，1.短信)
* @return $alarmPusW1ayEnd * @return $alarmPusW1ayEnd
*/ */
public Integer getAlarmPusW1ayEnd(){ public Integer getAlarmPusW1ayEnd(){
return this.alarmPusW1ayEnd; return this.alarmPusW1ayEnd;
} }
/** /**
* 设置 结束 推送方式,(0.不推送，1.短信) * 设置 结束 推送方式,(0.不推送，1.短信)
* @param alarmPusW1ayEnd * @param alarmPusW1ayEnd
*/ */
public void setAlarmPusW1ayEnd(Integer alarmPusW1ayEnd){ public void setAlarmPusW1ayEnd(Integer alarmPusW1ayEnd){
this.alarmPusW1ayEnd = alarmPusW1ayEnd; this.alarmPusW1ayEnd = alarmPusW1ayEnd;
} }
/** /**
* 获取 增加 推送方式,(0.不推送，1.短信) * 获取 增加 推送方式,(0.不推送，1.短信)
* @return alarmPusW1ayIncrement * @return alarmPusW1ayIncrement
*/ */
public Integer getAlarmPusW1ayIncrement(){ public Integer getAlarmPusW1ayIncrement(){
return this.alarmPusW1ayIncrement; return this.alarmPusW1ayIncrement;
} }
/** /**
* 设置 增加 推送方式,(0.不推送，1.短信) * 设置 增加 推送方式,(0.不推送，1.短信)
* @param alarmPusW1ayIncrement * @param alarmPusW1ayIncrement
*/ */
public void setAlarmPusW1ayIncrement(Integer alarmPusW1ayIncrement){ public void setAlarmPusW1ayIncrement(Integer alarmPusW1ayIncrement){
this.alarmPusW1ayIncrement = alarmPusW1ayIncrement; this.alarmPusW1ayIncrement = alarmPusW1ayIncrement;
} }
/** /**
* 获取 推送方式,(0.不推送，1.短信) * 获取 推送方式,(0.不推送，1.短信)
* @return alarmPusW1ayList * @return alarmPusW1ayList
*/ */
public List<Integer> getAlarmPusW1ayList(){ public List<Integer> getAlarmPusW1ayList(){
return this.alarmPusW1ayList; return this.alarmPusW1ayList;
} }
/** /**
* 设置 推送方式,(0.不推送，1.短信) * 设置 推送方式,(0.不推送，1.短信)
* @param alarmPusW1ayList * @param alarmPusW1ayList
*/ */
public void setAlarmPusW1ayList(List<Integer> alarmPusW1ayList){ public void setAlarmPusW1ayList(List<Integer> alarmPusW1ayList){
this.alarmPusW1ayList = alarmPusW1ayList; this.alarmPusW1ayList = alarmPusW1ayList;
} }
/** /**
* 获取 开始 是否启用(0.不启动，1.启动) * 获取 开始 是否启用(0.不启动，1.启动)
* @return isUseStart * @return isUseStart
*/ */
public Integer getIsUseStart(){ public Integer getIsUseStart(){
return this.isUseStart; return this.isUseStart;
} }
/** /**
* 设置 开始 是否启用(0.不启动，1.启动) * 设置 开始 是否启用(0.不启动，1.启动)
* @param isUseStart * @param isUseStart
*/ */
public void setIsUseStart(Integer isUseStart){ public void setIsUseStart(Integer isUseStart){
this.isUseStart = isUseStart; this.isUseStart = isUseStart;
} }
/** /**
* 获取 结束 是否启用(0.不启动，1.启动) * 获取 结束 是否启用(0.不启动，1.启动)
* @return $isUseEnd * @return $isUseEnd
*/ */
public Integer getIsUseEnd(){ public Integer getIsUseEnd(){
return this.isUseEnd; return this.isUseEnd;
} }
/** /**
* 设置 结束 是否启用(0.不启动，1.启动) * 设置 结束 是否启用(0.不启动，1.启动)
* @param isUseEnd * @param isUseEnd
*/ */
public void setIsUseEnd(Integer isUseEnd){ public void setIsUseEnd(Integer isUseEnd){
this.isUseEnd = isUseEnd; this.isUseEnd = isUseEnd;
} }
/** /**
* 获取 增加 是否启用(0.不启动，1.启动) * 获取 增加 是否启用(0.不启动，1.启动)
* @return isUseIncrement * @return isUseIncrement
*/ */
public Integer getIsUseIncrement(){ public Integer getIsUseIncrement(){
return this.isUseIncrement; return this.isUseIncrement;
} }
/** /**
* 设置 增加 是否启用(0.不启动，1.启动) * 设置 增加 是否启用(0.不启动，1.启动)
* @param isUseIncrement * @param isUseIncrement
*/ */
public void setIsUseIncrement(Integer isUseIncrement){ public void setIsUseIncrement(Integer isUseIncrement){
this.isUseIncrement = isUseIncrement; this.isUseIncrement = isUseIncrement;
} }
/** /**
* 获取 是否启用(0.不启动，1.启动) * 获取 是否启用(0.不启动，1.启动)
* @return isUseList * @return isUseList
*/ */
public List<Integer> getIsUseList(){ public List<Integer> getIsUseList(){
return this.isUseList; return this.isUseList;
} }
/** /**
* 设置 是否启用(0.不启动，1.启动) * 设置 是否启用(0.不启动，1.启动)
* @param isUseList * @param isUseList
*/ */
public void setIsUseList(List<Integer> isUseList){ public void setIsUseList(List<Integer> isUseList){
this.isUseList = isUseList; this.isUseList = isUseList;
} }
/** /**
* 获取 开始 创建时间 * 获取 备注
* @return createTimeStart * @return remarkList
*/ */
public List<String> getRemarkList(){
return this.remarkList;
}
/**
* 设置 备注
* @param remarkList
*/
public void setRemarkList(List<String> remarkList){
this.remarkList = remarkList;
}
/**
* 获取 开始 创建时间
* @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 AlarmConfigQuery id(Long id){ public AlarmConfigQuery id(Long id){
setId(id); setId(id);
return this; return this;
} }
/** /**
* 设置 开始 主键ID，主键，自增长 * 设置 开始 主键ID，主键，自增长
* @param idStart * @param idStart
*/ */
public AlarmConfigQuery idStart(Long idStart){ public AlarmConfigQuery idStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
return this; return this;
} }
/** /**
* 设置 结束 主键ID，主键，自增长 * 设置 结束 主键ID，主键，自增长
* @param idEnd * @param idEnd
*/ */
public AlarmConfigQuery idEnd(Long idEnd){ public AlarmConfigQuery idEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
return this; return this;
} }
/** /**
* 设置 增加 主键ID，主键，自增长 * 设置 增加 主键ID，主键，自增长
* @param idIncrement * @param idIncrement
*/ */
public AlarmConfigQuery idIncrement(Long idIncrement){ public AlarmConfigQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
return this; return this;
} }
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param idList * @param idList
*/ */
public AlarmConfigQuery idList(List<Long> idList){ public AlarmConfigQuery idList(List<Long> idList){
this.idList = idList; this.idList = idList;
return this; return this;
} }
/** /**
* 设置 产品 * 设置 产品
* @param productId * @param productId
*/ */
public AlarmConfigQuery productId(Long productId){ public AlarmConfigQuery productId(Long productId){
setProductId(productId); setProductId(productId);
return this; return this;
} }
/** /**
* 设置 开始 产品 * 设置 开始 产品
* @param productIdStart * @param productIdStart
*/ */
public AlarmConfigQuery productIdStart(Long productIdStart){ public AlarmConfigQuery productIdStart(Long productIdStart){
this.productIdStart = productIdStart; this.productIdStart = productIdStart;
return this; return this;
} }
/** /**
* 设置 结束 产品 * 设置 结束 产品
* @param productIdEnd * @param productIdEnd
*/ */
public AlarmConfigQuery productIdEnd(Long productIdEnd){ public AlarmConfigQuery productIdEnd(Long productIdEnd){
this.productIdEnd = productIdEnd; this.productIdEnd = productIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 产品 * 设置 增加 产品
* @param productIdIncrement * @param productIdIncrement
*/ */
public AlarmConfigQuery productIdIncrement(Long productIdIncrement){ public AlarmConfigQuery productIdIncrement(Long productIdIncrement){
this.productIdIncrement = productIdIncrement; this.productIdIncrement = productIdIncrement;
return this; return this;
} }
/** /**
* 设置 产品 * 设置 产品
* @param productIdList * @param productIdList
*/ */
public AlarmConfigQuery productIdList(List<Long> productIdList){ public AlarmConfigQuery productIdList(List<Long> productIdList){
this.productIdList = productIdList; this.productIdList = productIdList;
return this; return this;
} }
/** /**
* 设置 告警类型(0.离线) * 设置 告警类型(0.离线)
* @param alarmType * @param alarmType
*/ */
public AlarmConfigQuery alarmType(Integer alarmType){ public AlarmConfigQuery alarmType(Integer alarmType){
setAlarmType(alarmType); setAlarmType(alarmType);
return this; return this;
} }
/** /**
* 设置 开始 告警类型(0.离线) * 设置 开始 告警类型(0.离线)
* @param alarmTypeStart * @param alarmTypeStart
*/ */
public AlarmConfigQuery alarmTypeStart(Integer alarmTypeStart){ public AlarmConfigQuery alarmTypeStart(Integer alarmTypeStart){
this.alarmTypeStart = alarmTypeStart; this.alarmTypeStart = alarmTypeStart;
return this; return this;
} }
/** /**
* 设置 结束 告警类型(0.离线) * 设置 结束 告警类型(0.离线)
* @param alarmTypeEnd * @param alarmTypeEnd
*/ */
public AlarmConfigQuery alarmTypeEnd(Integer alarmTypeEnd){ public AlarmConfigQuery alarmTypeEnd(Integer alarmTypeEnd){
this.alarmTypeEnd = alarmTypeEnd; this.alarmTypeEnd = alarmTypeEnd;
return this; return this;
} }
/** /**
* 设置 增加 告警类型(0.离线) * 设置 增加 告警类型(0.离线)
* @param alarmTypeIncrement * @param alarmTypeIncrement
*/ */
public AlarmConfigQuery alarmTypeIncrement(Integer alarmTypeIncrement){ public AlarmConfigQuery alarmTypeIncrement(Integer alarmTypeIncrement){
this.alarmTypeIncrement = alarmTypeIncrement; this.alarmTypeIncrement = alarmTypeIncrement;
return this; return this;
} }
/** /**
* 设置 告警类型(0.离线) * 设置 告警类型(0.离线)
* @param alarmTypeList * @param alarmTypeList
*/ */
public AlarmConfigQuery alarmTypeList(List<Integer> alarmTypeList){ public AlarmConfigQuery alarmTypeList(List<Integer> alarmTypeList){
this.alarmTypeList = alarmTypeList; this.alarmTypeList = alarmTypeList;
return this; return this;
} }
/** /**
* 设置 告警级别,(0.危险，1.次要，2.一般) * 设置 告警级别,(0.危险，1.次要，2.一般)
* @param alarmLevel * @param alarmLevel
*/ */
public AlarmConfigQuery alarmLevel(Integer alarmLevel){ public AlarmConfigQuery alarmLevel(Integer alarmLevel){
setAlarmLevel(alarmLevel); setAlarmLevel(alarmLevel);
return this; return this;
} }
/** /**
* 设置 开始 告警级别,(0.危险，1.次要，2.一般) * 设置 开始 告警级别,(0.危险，1.次要，2.一般)
* @param alarmLevelStart * @param alarmLevelStart
*/ */
public AlarmConfigQuery alarmLevelStart(Integer alarmLevelStart){ public AlarmConfigQuery alarmLevelStart(Integer alarmLevelStart){
this.alarmLevelStart = alarmLevelStart; this.alarmLevelStart = alarmLevelStart;
return this; return this;
} }
/** /**
* 设置 结束 告警级别,(0.危险，1.次要，2.一般) * 设置 结束 告警级别,(0.危险，1.次要，2.一般)
* @param alarmLevelEnd * @param alarmLevelEnd
*/ */
public AlarmConfigQuery alarmLevelEnd(Integer alarmLevelEnd){ public AlarmConfigQuery alarmLevelEnd(Integer alarmLevelEnd){
this.alarmLevelEnd = alarmLevelEnd; this.alarmLevelEnd = alarmLevelEnd;
return this; return this;
} }
/** /**
* 设置 增加 告警级别,(0.危险，1.次要，2.一般) * 设置 增加 告警级别,(0.危险，1.次要，2.一般)
* @param alarmLevelIncrement * @param alarmLevelIncrement
*/ */
public AlarmConfigQuery alarmLevelIncrement(Integer alarmLevelIncrement){ public AlarmConfigQuery alarmLevelIncrement(Integer alarmLevelIncrement){
this.alarmLevelIncrement = alarmLevelIncrement; this.alarmLevelIncrement = alarmLevelIncrement;
return this; return this;
} }
/** /**
* 设置 告警级别,(0.危险，1.次要，2.一般) * 设置 告警级别,(0.危险，1.次要，2.一般)
* @param alarmLevelList * @param alarmLevelList
*/ */
public AlarmConfigQuery alarmLevelList(List<Integer> alarmLevelList){ public AlarmConfigQuery alarmLevelList(List<Integer> alarmLevelList){
this.alarmLevelList = alarmLevelList; this.alarmLevelList = alarmLevelList;
return this; return this;
} }
/** /**
* 设置 推送方式,(0.不推送，1.短信) * 设置 推送方式,(0.不推送，1.短信)
* @param alarmPusW1ay * @param alarmPusW1ay
*/ */
public AlarmConfigQuery alarmPusW1ay(Integer alarmPusW1ay){ public AlarmConfigQuery alarmPusW1ay(Integer alarmPusW1ay){
setAlarmPusW1ay(alarmPusW1ay); setAlarmPusW1ay(alarmPusW1ay);
return this; return this;
} }
/** /**
* 设置 开始 推送方式,(0.不推送，1.短信) * 设置 开始 推送方式,(0.不推送，1.短信)
* @param alarmPusW1ayStart * @param alarmPusW1ayStart
*/ */
public AlarmConfigQuery alarmPusW1ayStart(Integer alarmPusW1ayStart){ public AlarmConfigQuery alarmPusW1ayStart(Integer alarmPusW1ayStart){
this.alarmPusW1ayStart = alarmPusW1ayStart; this.alarmPusW1ayStart = alarmPusW1ayStart;
return this; return this;
} }
/** /**
* 设置 结束 推送方式,(0.不推送，1.短信) * 设置 结束 推送方式,(0.不推送，1.短信)
* @param alarmPusW1ayEnd * @param alarmPusW1ayEnd
*/ */
public AlarmConfigQuery alarmPusW1ayEnd(Integer alarmPusW1ayEnd){ public AlarmConfigQuery alarmPusW1ayEnd(Integer alarmPusW1ayEnd){
this.alarmPusW1ayEnd = alarmPusW1ayEnd; this.alarmPusW1ayEnd = alarmPusW1ayEnd;
return this; return this;
} }
/** /**
* 设置 增加 推送方式,(0.不推送，1.短信) * 设置 增加 推送方式,(0.不推送，1.短信)
* @param alarmPusW1ayIncrement * @param alarmPusW1ayIncrement
*/ */
public AlarmConfigQuery alarmPusW1ayIncrement(Integer alarmPusW1ayIncrement){ public AlarmConfigQuery alarmPusW1ayIncrement(Integer alarmPusW1ayIncrement){
this.alarmPusW1ayIncrement = alarmPusW1ayIncrement; this.alarmPusW1ayIncrement = alarmPusW1ayIncrement;
return this; return this;
} }
/** /**
* 设置 推送方式,(0.不推送，1.短信) * 设置 推送方式,(0.不推送，1.短信)
* @param alarmPusW1ayList * @param alarmPusW1ayList
*/ */
public AlarmConfigQuery alarmPusW1ayList(List<Integer> alarmPusW1ayList){ public AlarmConfigQuery alarmPusW1ayList(List<Integer> alarmPusW1ayList){
this.alarmPusW1ayList = alarmPusW1ayList; this.alarmPusW1ayList = alarmPusW1ayList;
return this; return this;
} }
/** /**
* 设置 是否启用(0.不启动，1.启动) * 设置 是否启用(0.不启动，1.启动)
* @param isUse * @param isUse
*/ */
public AlarmConfigQuery isUse(Integer isUse){ public AlarmConfigQuery isUse(Integer isUse){
setIsUse(isUse); setIsUse(isUse);
return this; return this;
} }
/** /**
* 设置 开始 是否启用(0.不启动，1.启动) * 设置 开始 是否启用(0.不启动，1.启动)
* @param isUseStart * @param isUseStart
*/ */
public AlarmConfigQuery isUseStart(Integer isUseStart){ public AlarmConfigQuery isUseStart(Integer isUseStart){
this.isUseStart = isUseStart; this.isUseStart = isUseStart;
return this; return this;
} }
/** /**
* 设置 结束 是否启用(0.不启动，1.启动) * 设置 结束 是否启用(0.不启动，1.启动)
* @param isUseEnd * @param isUseEnd
*/ */
public AlarmConfigQuery isUseEnd(Integer isUseEnd){ public AlarmConfigQuery isUseEnd(Integer isUseEnd){
this.isUseEnd = isUseEnd; this.isUseEnd = isUseEnd;
return this; return this;
} }
/** /**
* 设置 增加 是否启用(0.不启动，1.启动) * 设置 增加 是否启用(0.不启动，1.启动)
* @param isUseIncrement * @param isUseIncrement
*/ */
public AlarmConfigQuery isUseIncrement(Integer isUseIncrement){ public AlarmConfigQuery isUseIncrement(Integer isUseIncrement){
this.isUseIncrement = isUseIncrement; this.isUseIncrement = isUseIncrement;
return this; return this;
} }
/** /**
* 设置 是否启用(0.不启动，1.启动) * 设置 是否启用(0.不启动，1.启动)
* @param isUseList * @param isUseList
*/ */
public AlarmConfigQuery isUseList(List<Integer> isUseList){ public AlarmConfigQuery isUseList(List<Integer> isUseList){
this.isUseList = isUseList; this.isUseList = isUseList;
return this; return this;
} }
/**
* 设置 备注
* @param remark
*/
public AlarmConfigQuery remark(String remark){
setRemark(remark);
return this;
}
/**
* 设置 备注
* @param remarkList
*/
public AlarmConfigQuery remarkList(List<String> remarkList){
this.remarkList = remarkList;
return this;
}
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserId * @param updateUserId
*/ */
public AlarmConfigQuery updateUserId(Long updateUserId){ public AlarmConfigQuery updateUserId(Long updateUserId){
setUpdateUserId(updateUserId); setUpdateUserId(updateUserId);
return this; return this;
} }
/** /**
* 设置 开始 更新用户 * 设置 开始 更新用户
* @param updateUserIdStart * @param updateUserIdStart
*/ */
public AlarmConfigQuery updateUserIdStart(Long updateUserIdStart){ public AlarmConfigQuery updateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart; this.updateUserIdStart = updateUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 更新用户 * 设置 结束 更新用户
* @param updateUserIdEnd * @param updateUserIdEnd
*/ */
public AlarmConfigQuery updateUserIdEnd(Long updateUserIdEnd){ public AlarmConfigQuery updateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd; this.updateUserIdEnd = updateUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 更新用户 * 设置 增加 更新用户
* @param updateUserIdIncrement * @param updateUserIdIncrement
*/ */
public AlarmConfigQuery updateUserIdIncrement(Long updateUserIdIncrement){ public AlarmConfigQuery updateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement; this.updateUserIdIncrement = updateUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdList * @param updateUserIdList
*/ */
public AlarmConfigQuery updateUserIdList(List<Long> updateUserIdList){ public AlarmConfigQuery 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<AlarmConfigQuery> getOrConditionList(){ public List<AlarmConfigQuery> 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<AlarmConfigQuery> orConditionList){ public void setOrConditionList(List<AlarmConfigQuery> 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<AlarmConfigQuery> getAndConditionList(){ public List<AlarmConfigQuery> 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<AlarmConfigQuery> andConditionList){ public void setAndConditionList(List<AlarmConfigQuery> andConditionList){
this.andConditionList = andConditionList; this.andConditionList = andConditionList;
} }
......
device-manager/src/main/java/com/mortals/xhx/module/alarm/web/AlarmConfigController.java
View file @ 517e7875
...@@ -5,11 +5,15 @@ import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; ...@@ -5,11 +5,15 @@ 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.alarm.model.AlarmConfigEntity; import com.mortals.xhx.module.alarm.model.AlarmConfigEntity;
import com.mortals.xhx.module.alarm.service.AlarmConfigService; import com.mortals.xhx.module.alarm.service.AlarmConfigService;
import com.mortals.xhx.module.product.model.ProductEntity;
import com.mortals.xhx.module.product.service.ProductService;
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;
/** /**
* *
* 设备告警配置 * 设备告警配置
...@@ -23,6 +27,8 @@ public class AlarmConfigController extends BaseCRUDJsonBodyMappingController<Ala ...@@ -23,6 +27,8 @@ public class AlarmConfigController extends BaseCRUDJsonBodyMappingController<Ala
@Autowired @Autowired
private ParamService paramService; private ParamService paramService;
@Autowired
private ProductService productService;
public AlarmConfigController(){ public AlarmConfigController(){
super.setModuleDesc( "设备告警配置"); super.setModuleDesc( "设备告警配置");
...@@ -34,6 +40,9 @@ public class AlarmConfigController extends BaseCRUDJsonBodyMappingController<Ala ...@@ -34,6 +40,9 @@ public class AlarmConfigController extends BaseCRUDJsonBodyMappingController<Ala
this.addDict(model, "alarmLevel", paramService.getParamBySecondOrganize("AlarmConfig","alarmLevel")); this.addDict(model, "alarmLevel", paramService.getParamBySecondOrganize("AlarmConfig","alarmLevel"));
this.addDict(model, "alarmPusW1ay", paramService.getParamBySecondOrganize("AlarmConfig","alarmPusW1ay")); this.addDict(model, "alarmPusW1ay", paramService.getParamBySecondOrganize("AlarmConfig","alarmPusW1ay"));
this.addDict(model, "isUse", paramService.getParamBySecondOrganize("AlarmConfig","isUse")); this.addDict(model, "isUse", paramService.getParamBySecondOrganize("AlarmConfig","isUse"));
this.addDict(model, "productId", productService.find(new ProductEntity()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getProductName())));
super.init(model, context); super.init(model, context);
} }
......
device-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceModuleUseVo.java
View file @ 517e7875
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.DeviceModuleUseEntity; import com.mortals.xhx.module.device.model.DeviceModuleUseEntity;
import lombok.Data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
...@@ -9,6 +11,11 @@ import java.util.List; ...@@ -9,6 +11,11 @@ import java.util.List;
* @author zxfei * @author zxfei
* @date 2022-07-02 * @date 2022-07-02
*/ */
@Data
public class DeviceModuleUseVo extends BaseEntityLong { public class DeviceModuleUseVo extends BaseEntityLong {
/**
* 平台与产品名称
*/
private String platformAndProductName;
} }
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceModuleServiceImpl.java
View file @ 517e7875
package com.mortals.xhx.module.device.service.impl; package com.mortals.xhx.module.device.service.impl;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
import com.mortals.xhx.module.device.model.DeviceEntity;
import com.mortals.xhx.module.device.service.DeviceService;
import com.mortals.xhx.module.platform.model.PlatformEntity;
import com.mortals.xhx.module.platform.service.PlatformService;
import com.mortals.xhx.module.product.model.ProductEntity;
import com.mortals.xhx.module.product.service.ProductService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.xhx.module.device.dao.DeviceModuleDao; import com.mortals.xhx.module.device.dao.DeviceModuleDao;
import com.mortals.xhx.module.device.model.DeviceModuleEntity; import com.mortals.xhx.module.device.model.DeviceModuleEntity;
import com.mortals.xhx.module.device.service.DeviceModuleService; import com.mortals.xhx.module.device.service.DeviceModuleService;
import org.springframework.util.ObjectUtils;
import java.util.List;
/** /**
* DeviceModuleService * DeviceModuleService
* 设备模块信息 service实现 * 设备模块信息 service实现
* *
* @author zxfei * @author zxfei
* @date 2022-07-02 * @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 {
} }
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceModuleUseServiceImpl.java
View file @ 517e7875
package com.mortals.xhx.module.device.service.impl; package com.mortals.xhx.module.device.service.impl;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo;
import com.mortals.xhx.module.device.model.DeviceEntity;
import com.mortals.xhx.module.device.service.DeviceService;
import com.mortals.xhx.module.platform.model.PlatformEntity;
import com.mortals.xhx.module.platform.service.PlatformService;
import com.mortals.xhx.module.product.model.ProductEntity;
import com.mortals.xhx.module.product.service.ProductService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.xhx.module.device.dao.DeviceModuleUseDao; import com.mortals.xhx.module.device.dao.DeviceModuleUseDao;
import com.mortals.xhx.module.device.model.DeviceModuleUseEntity; import com.mortals.xhx.module.device.model.DeviceModuleUseEntity;
import com.mortals.xhx.module.device.service.DeviceModuleUseService; import com.mortals.xhx.module.device.service.DeviceModuleUseService;
import org.springframework.util.ObjectUtils;
import java.util.List;
/** /**
* DeviceModuleUseService * DeviceModuleUseService
* 设备模块使用频率 service实现 * 设备模块使用频率 service实现
* *
* @author zxfei * @author zxfei
* @date 2022-07-02 * @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 {
@Autowired
private PlatformService platformService;
@Autowired
private ProductService productService;
@Autowired
private DeviceService deviceService;
@Override
protected void findAfter(DeviceModuleUseEntity params, PageInfo pageInfo, Context context, List<DeviceModuleUseEntity> list) throws AppException {
list.stream().forEach(item -> {
DeviceEntity deviceEntity = deviceService.getExtCache(item.getDeviceId().toString());
if (!ObjectUtils.isEmpty(deviceEntity)) {
PlatformEntity platformEntity = platformService.get(deviceEntity.getPlatformId());
ProductEntity productEntity = productService.get(deviceEntity.getProductId());
if (!ObjectUtils.isEmpty(platformEntity) && !ObjectUtils.isEmpty(productEntity)) {
item.setPlatformAndProductName(platformEntity.getPlatformName() + "/" + productEntity.getProductName());
}
}
});
super.findAfter(params, pageInfo, context, list);
}
} }
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java
View file @ 517e7875
...@@ -240,8 +240,6 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D ...@@ -240,8 +240,6 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
Arrays.asList(ids).stream().forEach(id -> { Arrays.asList(ids).stream().forEach(id -> {
DeviceEntity deviceEntity = this.get(id, context); DeviceEntity deviceEntity = this.get(id, context);
if (!ObjectUtils.isEmpty(deviceEntity)) { if (!ObjectUtils.isEmpty(deviceEntity)) {
TbQueueCallback callback = new TbQueueCallback() { TbQueueCallback callback = new TbQueueCallback() {
@Override @Override
public void onSuccess(TbQueueMsgMetadata metadata) { public void onSuccess(TbQueueMsgMetadata metadata) {
...@@ -293,4 +291,6 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D ...@@ -293,4 +291,6 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
super.saveBefore(entity, context); super.saveBefore(entity, context);
} }
} }
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java
View file @ 517e7875
...@@ -11,6 +11,8 @@ import com.mortals.xhx.base.system.message.MessageService; ...@@ -11,6 +11,8 @@ import com.mortals.xhx.base.system.message.MessageService;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.busiz.rsp.ApiResp; import com.mortals.xhx.busiz.rsp.ApiResp;
import com.mortals.xhx.common.code.ApiRespCodeEnum; import com.mortals.xhx.common.code.ApiRespCodeEnum;
import com.mortals.xhx.common.code.DeviceStatusEnum;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.key.Constant; import com.mortals.xhx.common.key.Constant;
import com.mortals.xhx.common.model.DefaultTbQueueMsgHeaders; import com.mortals.xhx.common.model.DefaultTbQueueMsgHeaders;
import com.mortals.xhx.common.model.MessageHeader; import com.mortals.xhx.common.model.MessageHeader;
...@@ -30,6 +32,7 @@ import org.springframework.util.ObjectUtils; ...@@ -30,6 +32,7 @@ import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.IntStream; import java.util.stream.IntStream;
...@@ -171,4 +174,20 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe ...@@ -171,4 +174,20 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
return jsonObject.toJSONString(); return jsonObject.toJSONString();
} }
@Override
protected int doListAfter(DeviceEntity query, Map<String, Object> model, Context context) throws AppException {
//统计当前站点设备情况
if (!ObjectUtils.isEmpty(query.getSiteId())) {
List<DeviceEntity> deviceEntityList = this.service.find(query, context);
if (!ObjectUtils.isEmpty(deviceEntityList)) {
model.put("totalCount", deviceEntityList.size());
model.put("onlineCount", deviceEntityList.stream().filter(f -> f.getDeviceStatus() == DeviceStatusEnum.在线.getValue()).count());
model.put("offlineCount", deviceEntityList.stream().filter(f -> f.getDeviceStatus() == DeviceStatusEnum.离线.getValue()).count());
model.put("stopCount", deviceEntityList.stream().filter(f -> f.getDeviceStatus() != DeviceStatusEnum.未激活.getValue() && f.getEnabled() == YesNoEnum.NO.getValue()).count());
model.put("unActiveCount", deviceEntityList.stream().filter(f -> f.getDeviceStatus() == DeviceStatusEnum.未激活.getValue()).count());
}
}
return super.doListAfter(query, model, context);
}
} }
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceModuleUseController.java
View file @ 517e7875
package com.mortals.xhx.module.device.web; package com.mortals.xhx.module.device.web;
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.DeviceQuery;
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;
...@@ -35,6 +37,8 @@ public class DeviceModuleUseController extends BaseCRUDJsonBodyMappingController ...@@ -35,6 +37,8 @@ public class DeviceModuleUseController extends BaseCRUDJsonBodyMappingController
@Autowired @Autowired
private ParamService paramService; private ParamService paramService;
@Autowired
private DeviceService deviceService;
public DeviceModuleUseController(){ public DeviceModuleUseController(){
super.setModuleDesc( "设备模块使用频率"); super.setModuleDesc( "设备模块使用频率");
...@@ -42,6 +46,7 @@ public class DeviceModuleUseController extends BaseCRUDJsonBodyMappingController ...@@ -42,6 +46,7 @@ public class DeviceModuleUseController extends BaseCRUDJsonBodyMappingController
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "deviceId", 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/resources/sqlmap/module/alarm/AlarmConfigMapper.xml
View file @ 517e7875
<?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.alarm.dao.ibatis.AlarmConfigDaoImpl"> <mapper namespace="com.mortals.xhx.module.alarm.dao.ibatis.AlarmConfigDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="AlarmConfigEntity" id="AlarmConfigEntity-Map"> <resultMap type="AlarmConfigEntity" id="AlarmConfigEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="productId" column="productId" /> <result property="productId" column="productId" />
<result property="alarmType" column="alarmType" /> <result property="alarmType" column="alarmType" />
<result property="alarmLevel" column="alarmLevel" /> <result property="alarmLevel" column="alarmLevel" />
<result property="alarmPusW1ay" column="alarmPusW1ay" /> <result property="alarmPusW1ay" column="alarmPusW1ay" />
<result property="isUse" column="isUse" /> <result property="isUse" column="isUse" />
<result property="createTime" column="createTime" /> <result property="remark" column="remark" />
<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('productId') or colPickMode == 1 and data.containsKey('productId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('productId') or colPickMode == 1 and data.containsKey('productId')))">
a.productId, a.productId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('alarmType') or colPickMode == 1 and data.containsKey('alarmType')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('alarmType') or colPickMode == 1 and data.containsKey('alarmType')))">
a.alarmType, a.alarmType,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('alarmLevel') or colPickMode == 1 and data.containsKey('alarmLevel')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('alarmLevel') or colPickMode == 1 and data.containsKey('alarmLevel')))">
a.alarmLevel, a.alarmLevel,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('alarmPusW1ay') or colPickMode == 1 and data.containsKey('alarmPusW1ay')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('alarmPusW1ay') or colPickMode == 1 and data.containsKey('alarmPusW1ay')))">
a.alarmPusW1ay, a.alarmPusW1ay,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isUse') or colPickMode == 1 and data.containsKey('isUse')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isUse') or colPickMode == 1 and data.containsKey('isUse')))">
a.isUse, a.isUse,
</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('remark') or colPickMode == 1 and data.containsKey('remark')))">
a.createTime, a.remark,
</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="AlarmConfigEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="AlarmConfigEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_alarm_config insert into mortals_xhx_alarm_config
(productId,alarmType,alarmLevel,alarmPusW1ay,isUse,createTime,updateUserId,updateTime) (productId,alarmType,alarmLevel,alarmPusW1ay,isUse,remark,createTime,updateUserId,updateTime)
VALUES VALUES
(#{productId},#{alarmType},#{alarmLevel},#{alarmPusW1ay},#{isUse},#{createTime},#{updateUserId},#{updateTime}) (#{productId},#{alarmType},#{alarmLevel},#{alarmPusW1ay},#{isUse},#{remark},#{createTime},#{updateUserId},#{updateTime})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_alarm_config insert into mortals_xhx_alarm_config
(productId,alarmType,alarmLevel,alarmPusW1ay,isUse,createTime,updateUserId,updateTime) (productId,alarmType,alarmLevel,alarmPusW1ay,isUse,remark,createTime,updateUserId,updateTime)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.productId},#{item.alarmType},#{item.alarmLevel},#{item.alarmPusW1ay},#{item.isUse},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.productId},#{item.alarmType},#{item.alarmLevel},#{item.alarmPusW1ay},#{item.isUse},#{item.remark},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach> </foreach>
</insert> </insert>
...@@ -104,6 +108,9 @@ ...@@ -104,6 +108,9 @@
<if test="(colPickMode==0 and data.containsKey('isUseIncrement')) or (colPickMode==1 and !data.containsKey('isUseIncrement'))"> <if test="(colPickMode==0 and data.containsKey('isUseIncrement')) or (colPickMode==1 and !data.containsKey('isUseIncrement'))">
a.isUse=ifnull(a.isUse,0) + #{data.isUseIncrement}, a.isUse=ifnull(a.isUse,0) + #{data.isUseIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
a.remark=#{data.remark},
</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},
</if> </if>
...@@ -128,92 +135,99 @@ ...@@ -128,92 +135,99 @@
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_xhx_alarm_config as a update mortals_xhx_alarm_config as a
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<trim prefix="productId=(case" suffix="ELSE productId end),"> <trim prefix="productId=(case" suffix="ELSE productId 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('productId')) or (colPickMode==1 and !item.containsKey('productId'))"> <when test="(colPickMode==0 and item.containsKey('productId')) or (colPickMode==1 and !item.containsKey('productId'))">
when a.id=#{item.id} then #{item.productId} when a.id=#{item.id} then #{item.productId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('productIdIncrement')) or (colPickMode==1 and !item.containsKey('productIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('productIdIncrement')) or (colPickMode==1 and !item.containsKey('productIdIncrement'))">
when a.id=#{item.id} then ifnull(a.productId,0) + #{item.productIdIncrement} when a.id=#{item.id} then ifnull(a.productId,0) + #{item.productIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="alarmType=(case" suffix="ELSE alarmType end),"> <trim prefix="alarmType=(case" suffix="ELSE alarmType 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('alarmType')) or (colPickMode==1 and !item.containsKey('alarmType'))"> <when test="(colPickMode==0 and item.containsKey('alarmType')) or (colPickMode==1 and !item.containsKey('alarmType'))">
when a.id=#{item.id} then #{item.alarmType} when a.id=#{item.id} then #{item.alarmType}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('alarmTypeIncrement')) or (colPickMode==1 and !item.containsKey('alarmTypeIncrement'))"> <when test="(colPickMode==0 and item.containsKey('alarmTypeIncrement')) or (colPickMode==1 and !item.containsKey('alarmTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.alarmType,0) + #{item.alarmTypeIncrement} when a.id=#{item.id} then ifnull(a.alarmType,0) + #{item.alarmTypeIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="alarmLevel=(case" suffix="ELSE alarmLevel end),"> <trim prefix="alarmLevel=(case" suffix="ELSE alarmLevel 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('alarmLevel')) or (colPickMode==1 and !item.containsKey('alarmLevel'))"> <when test="(colPickMode==0 and item.containsKey('alarmLevel')) or (colPickMode==1 and !item.containsKey('alarmLevel'))">
when a.id=#{item.id} then #{item.alarmLevel} when a.id=#{item.id} then #{item.alarmLevel}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('alarmLevelIncrement')) or (colPickMode==1 and !item.containsKey('alarmLevelIncrement'))"> <when test="(colPickMode==0 and item.containsKey('alarmLevelIncrement')) or (colPickMode==1 and !item.containsKey('alarmLevelIncrement'))">
when a.id=#{item.id} then ifnull(a.alarmLevel,0) + #{item.alarmLevelIncrement} when a.id=#{item.id} then ifnull(a.alarmLevel,0) + #{item.alarmLevelIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="alarmPusW1ay=(case" suffix="ELSE alarmPusW1ay end),"> <trim prefix="alarmPusW1ay=(case" suffix="ELSE alarmPusW1ay 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('alarmPusW1ay')) or (colPickMode==1 and !item.containsKey('alarmPusW1ay'))"> <when test="(colPickMode==0 and item.containsKey('alarmPusW1ay')) or (colPickMode==1 and !item.containsKey('alarmPusW1ay'))">
when a.id=#{item.id} then #{item.alarmPusW1ay} when a.id=#{item.id} then #{item.alarmPusW1ay}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('alarmPusW1ayIncrement')) or (colPickMode==1 and !item.containsKey('alarmPusW1ayIncrement'))"> <when test="(colPickMode==0 and item.containsKey('alarmPusW1ayIncrement')) or (colPickMode==1 and !item.containsKey('alarmPusW1ayIncrement'))">
when a.id=#{item.id} then ifnull(a.alarmPusW1ay,0) + #{item.alarmPusW1ayIncrement} when a.id=#{item.id} then ifnull(a.alarmPusW1ay,0) + #{item.alarmPusW1ayIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="isUse=(case" suffix="ELSE isUse end),"> <trim prefix="isUse=(case" suffix="ELSE isUse 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('isUse')) or (colPickMode==1 and !item.containsKey('isUse'))"> <when test="(colPickMode==0 and item.containsKey('isUse')) or (colPickMode==1 and !item.containsKey('isUse'))">
when a.id=#{item.id} then #{item.isUse} when a.id=#{item.id} then #{item.isUse}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('isUseIncrement')) or (colPickMode==1 and !item.containsKey('isUseIncrement'))"> <when test="(colPickMode==0 and item.containsKey('isUseIncrement')) or (colPickMode==1 and !item.containsKey('isUseIncrement'))">
when a.id=#{item.id} then ifnull(a.isUse,0) + #{item.isUseIncrement} when a.id=#{item.id} then ifnull(a.isUse,0) + #{item.isUseIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> <trim prefix="remark=(case" suffix="ELSE remark 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('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
when a.id=#{item.id} then #{item.createTime} when a.id=#{item.id} then #{item.remark}
</if> </if>
</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=")">
...@@ -315,241 +329,261 @@ ...@@ -315,241 +329,261 @@
${_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('productId')"> <if test="conditionParamRef.containsKey('productId')">
<if test="conditionParamRef.productId != null "> <if test="conditionParamRef.productId != null ">
${_conditionType_} a.productId = #{${_conditionParam_}.productId} ${_conditionType_} a.productId = #{${_conditionParam_}.productId}
</if>
<if test="conditionParamRef.productId == null">
${_conditionType_} a.productId is null
</if>
</if>
<if test="conditionParamRef.containsKey('productIdList')">
${_conditionType_} a.productId in
<foreach collection="conditionParamRef.productIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('productIdStart') and conditionParamRef.productIdStart != null">
${_conditionType_} a.productId <![CDATA[ >= ]]> #{${_conditionParam_}.productIdStart}
</if> </if>
<if test="conditionParamRef.containsKey('productIdEnd') and conditionParamRef.productIdEnd != null"> <if test="conditionParamRef.productId == null">
${_conditionType_} a.productId <![CDATA[ <= ]]> #{${_conditionParam_}.productIdEnd} ${_conditionType_} a.productId is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('productIdList')">
${_conditionType_} a.productId in
<foreach collection="conditionParamRef.productIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('productIdStart') and conditionParamRef.productIdStart != null">
${_conditionType_} a.productId <![CDATA[ >= ]]> #{${_conditionParam_}.productIdStart}
</if>
<if test="conditionParamRef.containsKey('productIdEnd') and conditionParamRef.productIdEnd != null">
${_conditionType_} a.productId <![CDATA[ <= ]]> #{${_conditionParam_}.productIdEnd}
</if>
<if test="conditionParamRef.containsKey('alarmType')"> <if test="conditionParamRef.containsKey('alarmType')">
<if test="conditionParamRef.alarmType != null "> <if test="conditionParamRef.alarmType != null ">
${_conditionType_} a.alarmType = #{${_conditionParam_}.alarmType} ${_conditionType_} a.alarmType = #{${_conditionParam_}.alarmType}
</if>
<if test="conditionParamRef.alarmType == null">
${_conditionType_} a.alarmType is null
</if>
</if>
<if test="conditionParamRef.containsKey('alarmTypeList')">
${_conditionType_} a.alarmType in
<foreach collection="conditionParamRef.alarmTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('alarmTypeStart') and conditionParamRef.alarmTypeStart != null"> <if test="conditionParamRef.alarmType == null">
${_conditionType_} a.alarmType <![CDATA[ >= ]]> #{${_conditionParam_}.alarmTypeStart} ${_conditionType_} a.alarmType is null
</if>
<if test="conditionParamRef.containsKey('alarmTypeEnd') and conditionParamRef.alarmTypeEnd != null">
${_conditionType_} a.alarmType <![CDATA[ <= ]]> #{${_conditionParam_}.alarmTypeEnd}
</if> </if>
</if>
<if test="conditionParamRef.containsKey('alarmTypeList')">
${_conditionType_} a.alarmType in
<foreach collection="conditionParamRef.alarmTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('alarmTypeStart') and conditionParamRef.alarmTypeStart != null">
${_conditionType_} a.alarmType <![CDATA[ >= ]]> #{${_conditionParam_}.alarmTypeStart}
</if>
<if test="conditionParamRef.containsKey('alarmTypeEnd') and conditionParamRef.alarmTypeEnd != null">
${_conditionType_} a.alarmType <![CDATA[ <= ]]> #{${_conditionParam_}.alarmTypeEnd}
</if>
<if test="conditionParamRef.containsKey('alarmLevel')"> <if test="conditionParamRef.containsKey('alarmLevel')">
<if test="conditionParamRef.alarmLevel != null "> <if test="conditionParamRef.alarmLevel != null ">
${_conditionType_} a.alarmLevel = #{${_conditionParam_}.alarmLevel} ${_conditionType_} a.alarmLevel = #{${_conditionParam_}.alarmLevel}
</if>
<if test="conditionParamRef.alarmLevel == null">
${_conditionType_} a.alarmLevel is null
</if>
</if>
<if test="conditionParamRef.containsKey('alarmLevelList')">
${_conditionType_} a.alarmLevel in
<foreach collection="conditionParamRef.alarmLevelList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('alarmLevelStart') and conditionParamRef.alarmLevelStart != null"> <if test="conditionParamRef.alarmLevel == null">
${_conditionType_} a.alarmLevel <![CDATA[ >= ]]> #{${_conditionParam_}.alarmLevelStart} ${_conditionType_} a.alarmLevel is null
</if>
<if test="conditionParamRef.containsKey('alarmLevelEnd') and conditionParamRef.alarmLevelEnd != null">
${_conditionType_} a.alarmLevel <![CDATA[ <= ]]> #{${_conditionParam_}.alarmLevelEnd}
</if> </if>
</if>
<if test="conditionParamRef.containsKey('alarmLevelList')">
${_conditionType_} a.alarmLevel in
<foreach collection="conditionParamRef.alarmLevelList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('alarmLevelStart') and conditionParamRef.alarmLevelStart != null">
${_conditionType_} a.alarmLevel <![CDATA[ >= ]]> #{${_conditionParam_}.alarmLevelStart}
</if>
<if test="conditionParamRef.containsKey('alarmLevelEnd') and conditionParamRef.alarmLevelEnd != null">
${_conditionType_} a.alarmLevel <![CDATA[ <= ]]> #{${_conditionParam_}.alarmLevelEnd}
</if>
<if test="conditionParamRef.containsKey('alarmPusW1ay')"> <if test="conditionParamRef.containsKey('alarmPusW1ay')">
<if test="conditionParamRef.alarmPusW1ay != null "> <if test="conditionParamRef.alarmPusW1ay != null ">
${_conditionType_} a.alarmPusW1ay = #{${_conditionParam_}.alarmPusW1ay} ${_conditionType_} a.alarmPusW1ay = #{${_conditionParam_}.alarmPusW1ay}
</if>
<if test="conditionParamRef.alarmPusW1ay == null">
${_conditionType_} a.alarmPusW1ay is null
</if>
</if>
<if test="conditionParamRef.containsKey('alarmPusW1ayList')">
${_conditionType_} a.alarmPusW1ay in
<foreach collection="conditionParamRef.alarmPusW1ayList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('alarmPusW1ayStart') and conditionParamRef.alarmPusW1ayStart != null"> <if test="conditionParamRef.alarmPusW1ay == null">
${_conditionType_} a.alarmPusW1ay <![CDATA[ >= ]]> #{${_conditionParam_}.alarmPusW1ayStart} ${_conditionType_} a.alarmPusW1ay is null
</if>
<if test="conditionParamRef.containsKey('alarmPusW1ayEnd') and conditionParamRef.alarmPusW1ayEnd != null">
${_conditionType_} a.alarmPusW1ay <![CDATA[ <= ]]> #{${_conditionParam_}.alarmPusW1ayEnd}
</if> </if>
</if>
<if test="conditionParamRef.containsKey('alarmPusW1ayList')">
${_conditionType_} a.alarmPusW1ay in
<foreach collection="conditionParamRef.alarmPusW1ayList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('alarmPusW1ayStart') and conditionParamRef.alarmPusW1ayStart != null">
${_conditionType_} a.alarmPusW1ay <![CDATA[ >= ]]> #{${_conditionParam_}.alarmPusW1ayStart}
</if>
<if test="conditionParamRef.containsKey('alarmPusW1ayEnd') and conditionParamRef.alarmPusW1ayEnd != null">
${_conditionType_} a.alarmPusW1ay <![CDATA[ <= ]]> #{${_conditionParam_}.alarmPusW1ayEnd}
</if>
<if test="conditionParamRef.containsKey('isUse')"> <if test="conditionParamRef.containsKey('isUse')">
<if test="conditionParamRef.isUse != null "> <if test="conditionParamRef.isUse != null ">
${_conditionType_} a.isUse = #{${_conditionParam_}.isUse} ${_conditionType_} a.isUse = #{${_conditionParam_}.isUse}
</if>
<if test="conditionParamRef.isUse == null">
${_conditionType_} a.isUse is null
</if>
</if>
<if test="conditionParamRef.containsKey('isUseList')">
${_conditionType_} a.isUse in
<foreach collection="conditionParamRef.isUseList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('isUseStart') and conditionParamRef.isUseStart != null"> <if test="conditionParamRef.isUse == null">
${_conditionType_} a.isUse <![CDATA[ >= ]]> #{${_conditionParam_}.isUseStart} ${_conditionType_} a.isUse is null
</if>
<if test="conditionParamRef.containsKey('isUseEnd') and conditionParamRef.isUseEnd != null">
${_conditionType_} a.isUse <![CDATA[ <= ]]> #{${_conditionParam_}.isUseEnd}
</if> </if>
</if>
<if test="conditionParamRef.containsKey('isUseList')">
${_conditionType_} a.isUse in
<foreach collection="conditionParamRef.isUseList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isUseStart') and conditionParamRef.isUseStart != null">
${_conditionType_} a.isUse <![CDATA[ >= ]]> #{${_conditionParam_}.isUseStart}
</if>
<if test="conditionParamRef.containsKey('isUseEnd') and conditionParamRef.isUseEnd != null">
${_conditionType_} a.isUse <![CDATA[ <= ]]> #{${_conditionParam_}.isUseEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('remark')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime} ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
</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>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''"> <if test="conditionParamRef.remark == null">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.remark is null
</if> </if>
<if test="conditionParamRef.containsKey('updateUserId')"> </if>
<if test="conditionParamRef.updateUserId != null "> <if test="conditionParamRef.containsKey('remarkList')">
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId} ${_conditionType_} a.remark in
</if> <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.updateUserId == null"> #{item}
${_conditionType_} a.updateUserId is null </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</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>
<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('productId')"> <if test="orderCol.containsKey('productId')">
a.productId a.productId
<if test='orderCol.productId != null and "DESC".equalsIgnoreCase(orderCol.productId)'>DESC</if> <if test='orderCol.productId != null and "DESC".equalsIgnoreCase(orderCol.productId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('alarmType')"> <if test="orderCol.containsKey('alarmType')">
a.alarmType a.alarmType
<if test='orderCol.alarmType != null and "DESC".equalsIgnoreCase(orderCol.alarmType)'>DESC</if> <if test='orderCol.alarmType != null and "DESC".equalsIgnoreCase(orderCol.alarmType)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('alarmLevel')"> <if test="orderCol.containsKey('alarmLevel')">
a.alarmLevel a.alarmLevel
<if test='orderCol.alarmLevel != null and "DESC".equalsIgnoreCase(orderCol.alarmLevel)'>DESC</if> <if test='orderCol.alarmLevel != null and "DESC".equalsIgnoreCase(orderCol.alarmLevel)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('alarmPusW1ay')"> <if test="orderCol.containsKey('alarmPusW1ay')">
a.alarmPusW1ay a.alarmPusW1ay
<if test='orderCol.alarmPusW1ay != null and "DESC".equalsIgnoreCase(orderCol.alarmPusW1ay)'>DESC</if> <if test='orderCol.alarmPusW1ay != null and "DESC".equalsIgnoreCase(orderCol.alarmPusW1ay)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('isUse')"> <if test="orderCol.containsKey('isUse')">
a.isUse a.isUse
<if test='orderCol.isUse != null and "DESC".equalsIgnoreCase(orderCol.isUse)'>DESC</if> <if test='orderCol.isUse != null and "DESC".equalsIgnoreCase(orderCol.isUse)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('remark')">
a.createTime a.remark
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>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>
......
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