From c19842a8cc158631c970a9d41f73489579eb67ee Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 15 七月 2024 15:24:39 +0800
Subject: [PATCH] 设备报警报表
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentAlarmServiceImpl.java | 112 ++++++++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentAlarmMapper.java | 23 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml | 70 ++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/EquipmentAlarmVo.java | 61 ++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IEquipmentAlarmService.java | 27 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/EquipmentAlarmController.java | 81 +++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/EquipmentAlarmDto.java | 28 ++++
7 files changed, 402 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/EquipmentAlarmController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/EquipmentAlarmController.java
new file mode 100644
index 0000000..4270c93
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/EquipmentAlarmController.java
@@ -0,0 +1,81 @@
+package org.jeecg.modules.mdc.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.mdc.dto.EquipmentAlarmDto;
+import org.jeecg.modules.mdc.entity.EquipmentAlarm;
+import org.jeecg.modules.mdc.entity.EquipmentBeilvAlarm;
+import org.jeecg.modules.mdc.entity.MdcTorqueConfig;
+import org.jeecg.modules.mdc.service.IEquipmentAlarmService;
+import org.jeecg.modules.mdc.vo.EquipmentAlarmVo;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @Description: 璁惧鎶ヨ
+ * @Author: lius
+ * @Date: 2024-07-15
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags = "璁惧鎶ヨ")
+@RestController
+@RequestMapping("/mdc/equipmentAlarm")
+public class EquipmentAlarmController extends JeecgController<EquipmentAlarm, IEquipmentAlarmService> {
+
+ @Resource
+ private IEquipmentAlarmService equipmentAlarmService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param equipmentAlarmVo
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "璁惧鎶ヨ-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "璁惧鎶ヨ-鍒嗛〉鍒楄〃鏌ヨ", notes = "璁惧鎶ヨ-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(EquipmentAlarmVo equipmentAlarmVo,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ Page<EquipmentAlarmDto> page = new Page<EquipmentAlarmDto>(pageNo, pageSize);
+ IPage<EquipmentAlarmDto> pageList = equipmentAlarmService.pageList(userId, page, equipmentAlarmVo, req);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param equipmentAlarmVo
+ * @return
+ */
+ @AutoLog(value = "璁惧鎶ヨ-瀵煎嚭")
+ @ApiOperation(value = "璁惧鎶ヨ-瀵煎嚭", notes = "璁惧鎶ヨ-瀵煎嚭")
+ @RequestMapping("/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, EquipmentAlarmVo equipmentAlarmVo) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ return this.equipmentAlarmService.exportXls(userId, equipmentAlarmVo);
+ }
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/EquipmentAlarmDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/EquipmentAlarmDto.java
new file mode 100644
index 0000000..b41a7d4
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/EquipmentAlarmDto.java
@@ -0,0 +1,28 @@
+package org.jeecg.modules.mdc.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author Lius
+ * @date 2024/7/15 13:54
+ */
+@Data
+public class EquipmentAlarmDto {
+ @Excel(name = "璁惧缂栧彿", width = 15)
+ private String equipmentId;
+ @Excel(name = "璁惧鍚嶇О", width = 20)
+ private String equipmentName;
+ @Excel(name = "鏃ユ湡", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date collecttime;
+ @Excel(name = "鎶ヨ缂栧彿", width = 30)
+ private String alarmNo;
+ @Excel(name = "鎶ヨ鎻忚堪", width = 50)
+ private String alarmContent;
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentAlarmMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentAlarmMapper.java
index 4bbcd26..dd399e1 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentAlarmMapper.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentAlarmMapper.java
@@ -1,11 +1,34 @@
package org.jeecg.modules.mdc.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.mdc.dto.EquipmentAlarmDto;
import org.jeecg.modules.mdc.entity.EquipmentAlarm;
+import org.jeecg.modules.mdc.vo.EquipmentAlarmVo;
+
+import java.util.List;
/**
* @author: LiuS
* @create: 2023-04-12 16:39
*/
public interface EquipmentAlarmMapper extends BaseMapper<EquipmentAlarm> {
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param page
+ * @param equipmentAlarmVo
+ * @return
+ */
+ IPage<EquipmentAlarmDto> pageList(Page<EquipmentAlarmDto> page, @Param("equipmentAlarmVo") EquipmentAlarmVo equipmentAlarmVo);
+
+ /**
+ * 瀵煎嚭鍒楄〃
+ *
+ * @param equipmentAlarmVo
+ * @return
+ */
+ List<EquipmentAlarmDto> list(@Param("equipmentAlarmVo") EquipmentAlarmVo equipmentAlarmVo);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml
new file mode 100644
index 0000000..374bde2
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.mdc.mapper.EquipmentAlarmMapper">
+ <!--鍒嗛〉鏌ヨ-->
+ <select id="pageList" resultType="org.jeecg.modules.mdc.dto.EquipmentAlarmDto">
+ SELECT
+ t1.EquipmentID,
+ t2.equipment_name,
+ t1.collectTime,
+ t1.AlarmNo,
+ t1.AlarmContent
+ FROM
+ EquipmentAlarm t1 LEFT JOIN mdc_equipment t2 ON t1.EquipmentID = t2.equipment_id
+ <where>
+ <if test="equipmentAlarmVo.equipmentId != null and equipmentAlarmVo.equipmentId != ''">
+ AND t1.equipment_id LIKE CONCAT(CONCAT('%',#{equipmentAlarmVo.equipmentId}),'%')
+ </if>
+ <if test="equipmentAlarmVo.equipmentName != null and equipmentAlarmVo.equipmentName != ''">
+ AND t1.equipment_id LIKE CONCAT(CONCAT('%',#{equipmentAlarmVo.equipmentName}),'%')
+ </if>
+ <if test="equipmentAlarmVo.startTime != null and equipmentAlarmVo.endTime != null">
+ AND t1.collectTime BETWEEN #{equipmentAlarmVo.startTime} AND #{equipmentAlarmVo.endTime}
+ </if>
+ <if test="equipmentAlarmVo.equipmentIdList != null and equipmentAlarmVo.equipmentIdList.size() > 0">
+ AND t1.EquipmentID IN
+ <foreach collection="equipmentAlarmVo.equipmentIdList" index="index" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+ AND t1.AlarmNo <> ''
+ </where>
+ ORDER BY t1.collectTime DESC
+ <if test="equipmentAlarmVo.sortFlag != null and equipmentAlarmVo.sortFlag != ''">
+ , t1.EquipmentID DESC
+ </if>
+ </select>
+
+ <select id="list" resultType="org.jeecg.modules.mdc.dto.EquipmentAlarmDto">
+ SELECT
+ t1.EquipmentID,
+ t2.equipment_name,
+ t1.collectTime,
+ t1.AlarmNo,
+ t1.AlarmContent
+ FROM
+ EquipmentAlarm t1 LEFT JOIN mdc_equipment t2 ON t1.EquipmentID = t2.equipment_id
+ <where>
+ <if test="equipmentAlarmVo.equipmentId != null and equipmentAlarmVo.equipmentId != ''">
+ AND t1.equipment_id LIKE CONCAT(CONCAT('%',#{equipmentAlarmVo.equipmentId}),'%')
+ </if>
+ <if test="equipmentAlarmVo.equipmentName != null and equipmentAlarmVo.equipmentName != ''">
+ AND t1.equipment_id LIKE CONCAT(CONCAT('%',#{equipmentAlarmVo.equipmentName}),'%')
+ </if>
+ <if test="equipmentAlarmVo.startTime != null and equipmentAlarmVo.endTime != null">
+ AND t1.collectTime BETWEEN #{equipmentAlarmVo.startTime} AND #{equipmentAlarmVo.endTime}
+ </if>
+ <if test="equipmentAlarmVo.equipmentIdList != null and equipmentAlarmVo.equipmentIdList.size() > 0">
+ AND t1.EquipmentID IN
+ <foreach collection="equipmentAlarmVo.equipmentIdList" index="index" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+ AND t1.AlarmNo <> ''
+ </where>
+ ORDER BY t1.collectTime DESC
+ <if test="equipmentAlarmVo.sortFlag != null and equipmentAlarmVo.sortFlag != ''">
+ , t1.EquipmentID DESC
+ </if>
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IEquipmentAlarmService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IEquipmentAlarmService.java
index 1b072fe..069b3fc 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IEquipmentAlarmService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IEquipmentAlarmService.java
@@ -1,8 +1,14 @@
package org.jeecg.modules.mdc.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.mdc.dto.EquipmentAlarmDto;
import org.jeecg.modules.mdc.entity.EquipmentAlarm;
+import org.jeecg.modules.mdc.vo.EquipmentAlarmVo;
+import org.springframework.web.servlet.ModelAndView;
+import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.List;
@@ -12,4 +18,25 @@
*/
public interface IEquipmentAlarmService extends IService<EquipmentAlarm> {
List<EquipmentAlarm> findEquipmentAlarmByDate(String equipmentId, Date startTime, Date endTime);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param userId
+ * @param page
+ * @param equipmentAlarmVo
+ * @param req
+ * @return
+ */
+ IPage<EquipmentAlarmDto> pageList(String userId, Page<EquipmentAlarmDto> page, EquipmentAlarmVo equipmentAlarmVo, HttpServletRequest req);
+
+ /**
+ * 瀵煎嚭
+ *
+ * @param userId
+ * @param equipmentAlarmVo
+ * @return
+ */
+ ModelAndView exportXls(String userId, EquipmentAlarmVo equipmentAlarmVo);
+
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentAlarmServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentAlarmServiceImpl.java
index aa11e2d..e1b01ce 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentAlarmServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentAlarmServiceImpl.java
@@ -1,12 +1,29 @@
package org.jeecg.modules.mdc.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.mdc.dto.EquipmentAlarmDto;
import org.jeecg.modules.mdc.entity.EquipmentAlarm;
+import org.jeecg.modules.mdc.entity.MdcEquipmentOvertime;
import org.jeecg.modules.mdc.mapper.EquipmentAlarmMapper;
import org.jeecg.modules.mdc.service.IEquipmentAlarmService;
+import org.jeecg.modules.mdc.service.IMdcEquipmentService;
+import org.jeecg.modules.mdc.vo.EquipmentAlarmVo;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.stereotype.Service;
+import org.springframework.web.servlet.ModelAndView;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -16,10 +33,105 @@
*/
@Service
public class EquipmentAlarmServiceImpl extends ServiceImpl<EquipmentAlarmMapper, EquipmentAlarm> implements IEquipmentAlarmService {
+
+ @Resource
+ private IMdcEquipmentService mdcEquipmentService;
+
@Override
public List<EquipmentAlarm> findEquipmentAlarmByDate(String equipmentId, Date startTime, Date endTime) {
return this.list(new LambdaQueryWrapper<EquipmentAlarm>()
.ge(EquipmentAlarm::getCollecttime, startTime).le(EquipmentAlarm::getCollecttime, endTime)
.eq(EquipmentAlarm::getEquipmentid, equipmentId).orderByDesc(EquipmentAlarm::getCollecttime));
}
+
+ /**
+ * 鍒嗛〉鍒楄〃
+ *
+ * @param userId
+ * @param page
+ * @param equipmentAlarmVo
+ * @param req
+ * @return
+ */
+ @Override
+ public IPage<EquipmentAlarmDto> pageList(String userId, Page<EquipmentAlarmDto> page, EquipmentAlarmVo equipmentAlarmVo, HttpServletRequest req) {
+ List<String> equipmentIds = new ArrayList<>();
+ if (StringUtils.isNotEmpty(equipmentAlarmVo.getParentId()) && StringUtils.isEmpty(equipmentAlarmVo.getEquipmentId())) {
+ if ("2".equals(equipmentAlarmVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, equipmentAlarmVo.getParentId());
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, equipmentAlarmVo.getParentId());
+ }
+ } else if (StringUtils.isNotEmpty(equipmentAlarmVo.getEquipmentId())) {
+ //鍗曞彴璁惧淇℃伅
+ equipmentAlarmVo.setEquipmentIdList(Collections.singletonList(equipmentAlarmVo.getEquipmentId()));
+ } else {
+ //鏌ヨ鐢ㄦ埛鎷ユ湁鐨勬墍鏈夎澶囦俊鎭�
+ if ("2".equals(equipmentAlarmVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
+ }
+ }
+
+ if (equipmentAlarmVo.getEquipmentIdList() == null || equipmentAlarmVo.getEquipmentIdList().isEmpty()) {
+ equipmentAlarmVo.setEquipmentIdList(equipmentIds);
+ }
+
+ if (equipmentAlarmVo.getEquipmentIdList() == null || equipmentAlarmVo.getEquipmentIdList().isEmpty()) {
+ return null;
+ }
+ return this.baseMapper.pageList(page, equipmentAlarmVo);
+ }
+
+ @Override
+ public ModelAndView exportXls(String userId, EquipmentAlarmVo equipmentAlarmVo) {
+ List<String> equipmentIds = new ArrayList<>();
+ if (StringUtils.isNotEmpty(equipmentAlarmVo.getParentId()) && StringUtils.isEmpty(equipmentAlarmVo.getEquipmentId())) {
+ if ("2".equals(equipmentAlarmVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, equipmentAlarmVo.getParentId());
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, equipmentAlarmVo.getParentId());
+ }
+ } else if (StringUtils.isNotEmpty(equipmentAlarmVo.getEquipmentId())) {
+ //鍗曞彴璁惧淇℃伅
+ equipmentAlarmVo.setEquipmentIdList(Collections.singletonList(equipmentAlarmVo.getEquipmentId()));
+ } else {
+ //鏌ヨ鐢ㄦ埛鎷ユ湁鐨勬墍鏈夎澶囦俊鎭�
+ if ("2".equals(equipmentAlarmVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
+ }
+ }
+
+ if (equipmentAlarmVo.getEquipmentIdList() == null || equipmentAlarmVo.getEquipmentIdList().isEmpty()) {
+ equipmentAlarmVo.setEquipmentIdList(equipmentIds);
+ }
+
+ if (equipmentAlarmVo.getEquipmentIdList() == null || equipmentAlarmVo.getEquipmentIdList().isEmpty()) {
+ return null;
+ }
+ // Step.2 AutoPoi 瀵煎嚭Excel
+ ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+ List<EquipmentAlarmDto> equipmentAlarmDtos = this.baseMapper.list(equipmentAlarmVo);
+ // 瀵煎嚭鏂囦欢鍚嶇О
+ mv.addObject(NormalExcelConstants.FILE_NAME, "璁惧鎶ヨ鍒楄〃");
+ mv.addObject(NormalExcelConstants.CLASS, EquipmentAlarmDto.class);
+ //鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
+ //update-begin---author:wangshuai ---date:20211227 for锛歔JTC-116]瀵煎嚭浜哄啓姝讳簡------------
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("璁惧鎶ヨ鍒楄〃鏁版嵁", "瀵煎嚭浜�:" + user.getRealname(), "璁惧鎶ヨ"));
+ //update-end---author:wangshuai ---date:20211227 for锛歔JTC-116]瀵煎嚭浜哄啓姝讳簡------------
+ mv.addObject(NormalExcelConstants.DATA_LIST, equipmentAlarmDtos);
+ return mv;
+ }
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/EquipmentAlarmVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/EquipmentAlarmVo.java
new file mode 100644
index 0000000..f4e38bc
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/EquipmentAlarmVo.java
@@ -0,0 +1,61 @@
+package org.jeecg.modules.mdc.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Lius
+ * @date 2024/7/15 13:42
+ */
+@Data
+public class EquipmentAlarmVo {
+
+ /**
+ * 寮�濮嬫椂闂� -> yyyy-MM-dd HH:mm:ss
+ */
+ @ApiModelProperty(value = "寮�濮嬫椂闂�(yyyy-MM-dd HH:mm:ss)")
+ private String startTime;
+ /**
+ * 缁撴潫鏃堕棿 -> yyyy-MM-dd HH:mm:ss
+ */
+ @ApiModelProperty(value = "缁撴潫鏃堕棿(yyyy-MM-dd HH:mm:ss)")
+ private String endTime;
+ /**
+ * 鏍戠被鍨� -> 1:杞﹂棿灞傜骇 2:閮ㄩ棬灞傜骇
+ */
+ @ApiModelProperty(value = "鏍戠被鍨�")
+ private String typeTree;
+ /**
+ * 灞傜骇ID
+ */
+ @ApiModelProperty(value = "灞傜骇ID")
+ private String parentId;
+ /**
+ * 璁惧Id
+ */
+ @ApiModelProperty(value = "璁惧Id")
+ private String equipmentId;
+ /**
+ * 璁惧Id
+ */
+ @ApiModelProperty(value = "璁惧鍚嶇О")
+ private String equipmentName;
+ /**
+ * 鎶ヨ鍙�
+ */
+ @ApiModelProperty(value = "鎶ヨ鍙�")
+ private String alarmNo;
+ /**
+ * 鎺掑簭鏍囧織
+ */
+ @ApiModelProperty(value = "鎺掑簭鏍囧織")
+ private String sortFlag;
+ /**
+ * 璁惧ids
+ */
+ @ApiModelProperty(value = "璁惧ids")
+ private List<String> equipmentIdList;
+
+}
--
Gitblit v1.9.3