From 13caf8636cd5c8f539e7a7e89c98713075eee765 Mon Sep 17 00:00:00 2001 From: mashuai Date: Fri, 20 Sep 2024 09:29:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=B9=E5=B8=A6=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TbDevAttributeController.java | 28 +++++++++- .../com/bonus/base/domain/TbDevAttribute.java | 8 +++ .../base/mapper/TbDevAttributeMapper.java | 3 +- .../base/service/TbDevAttributeService.java | 11 +++- .../impl/TbDevAttributeServiceImpl.java | 34 +++++++++--- .../com/bonus/base/vo/TbDevAttributeVo.java | 52 +++++++++++++++++++ .../mapper/base/TbBdRecordMapper.xml | 2 +- .../mapper/base/TbDevAttributeMapper.xml | 39 +++++++++++--- .../resources/mapper/base/TbDeviceMapper.xml | 2 +- 9 files changed, 162 insertions(+), 17 deletions(-) create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/vo/TbDevAttributeVo.java diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbDevAttributeController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbDevAttributeController.java index 088e6dd..f981b0b 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbDevAttributeController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbDevAttributeController.java @@ -1,13 +1,19 @@ package com.bonus.base.controller; +import com.bonus.base.domain.TbBdRecord; import com.bonus.base.domain.TbDevAttribute; import com.bonus.base.service.TbDevAttributeService; +import com.bonus.base.vo.TbDevAttributeVo; +import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import org.springframework.web.bind.annotation.*; import org.springframework.beans.factory.annotation.Autowired; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -35,7 +41,7 @@ public class TbDevAttributeController extends BaseController { @GetMapping("/list") public AjaxResult queryByPage(TbDevAttribute record) { startPage(); - List list = tbDevAttributeService.queryAll(record); + List list = tbDevAttributeService.queryAll(record); return AjaxResult.success(getDataTable(list)); } @@ -71,6 +77,26 @@ public class TbDevAttributeController extends BaseController { return toAjax(tbDevAttributeService.deleteByPrimaryKey(id)); } + /** + * 预警告警异常记录处理 + * @param handle + * @return + */ + @PostMapping("/handle") + public AjaxResult approve(TbDevAttribute handle) { + return tbDevAttributeService.handle(handle); + } + /** + * 预警告警异常记录导出数据 + * @param response + * @param record + */ + @PostMapping("/export") + public void export(HttpServletResponse response, TbDevAttribute record) { + List list = tbDevAttributeService.queryAll(record); + ExcelUtil util = new ExcelUtil<>(TbDevAttributeVo.class); + util.exportExcel(response, list, "预警告警异常记录"); + } } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbDevAttribute.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbDevAttribute.java index e4d94d5..b306d80 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbDevAttribute.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbDevAttribute.java @@ -1,5 +1,6 @@ package com.bonus.base.domain; +import com.bonus.common.core.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; @@ -78,7 +79,14 @@ public class TbDevAttribute implements Serializable { */ @ApiModelProperty(value="检测时间") @Size(max = 32,message = "检测时间最大长度要小于 32") + @Excel(name = "预警时间") private String jcTime; + @ApiModelProperty(value="开始时间") + private String startTime; + + @ApiModelProperty(value="结束时间") + private String endTime; + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbDevAttributeMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbDevAttributeMapper.java index c4ba658..d9fd1c8 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbDevAttributeMapper.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbDevAttributeMapper.java @@ -1,4 +1,5 @@ package com.bonus.base.mapper; +import com.bonus.base.vo.TbDevAttributeVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -11,7 +12,7 @@ import java.util.List; @Mapper public interface TbDevAttributeMapper { - List queryAll(TbDevAttribute record); + List queryAll(TbDevAttribute record); int deleteByPrimaryKey(Long id); diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbDevAttributeService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbDevAttributeService.java index bbb9d37..4a65f40 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbDevAttributeService.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbDevAttributeService.java @@ -2,6 +2,9 @@ package com.bonus.base.service; import java.util.List; import com.bonus.base.domain.TbDevAttribute; +import com.bonus.base.vo.TbDevAttributeVo; +import com.bonus.common.core.web.domain.AjaxResult; + /** * @author : syruan */ @@ -23,6 +26,12 @@ public interface TbDevAttributeService{ int updateBatch(List list); - List queryAll(TbDevAttribute record); + List queryAll(TbDevAttribute record); + /** + * 预警告警异常记录处理 + * @param handle + * @return + */ + AjaxResult handle(TbDevAttribute handle); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbDevAttributeServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbDevAttributeServiceImpl.java index d77844f..6bb4bde 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbDevAttributeServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbDevAttributeServiceImpl.java @@ -1,5 +1,8 @@ package com.bonus.base.service.impl; +import com.alibaba.nacos.common.utils.CollectionUtils; +import com.bonus.base.vo.TbDevAttributeVo; +import com.bonus.common.core.web.domain.AjaxResult; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; @@ -62,11 +65,30 @@ public class TbDevAttributeServiceImpl implements TbDevAttributeService{ } @Override - public List queryAll(TbDevAttribute record){ - return tbDevAttributeMapper.queryAll(record); - } - - - + public List queryAll(TbDevAttribute record){ + List list = tbDevAttributeMapper.queryAll(record); + if (CollectionUtils.isNotEmpty(list)) { + for (TbDevAttributeVo attribute : list) { + if (attribute.getIsWarn() == 1) { + attribute.setWarnName(attribute.getJcName() + "超过阈值"); + attribute.setStatus("未处置"); + } else { + attribute.setWarnName("正常"); + attribute.setStatus("已处置"); + } + } + } + return list; + } + /** + * 预警告警异常记录处理 + * @param handle + * @return + */ + @Override + public AjaxResult handle(TbDevAttribute handle) { + int result = tbDevAttributeMapper.updateByPrimaryKeySelective(handle); + return result > 0 ? AjaxResult.success("处理成功") : AjaxResult.error("处理失败"); + } } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/vo/TbDevAttributeVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/vo/TbDevAttributeVo.java new file mode 100644 index 0000000..b102b0d --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/vo/TbDevAttributeVo.java @@ -0,0 +1,52 @@ +package com.bonus.base.vo; + +import com.bonus.base.domain.TbDevAttribute; +import com.bonus.common.core.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author ma_sh + * @create 2024/9/19 19:52 + */ +@Data +public class TbDevAttributeVo extends TbDevAttribute { + + /** + * 设备类型(码表) + */ + @ApiModelProperty(value="设备类型(码表)") + private String devType; + + /** + * 设备类型(码表) + */ + @ApiModelProperty(value="设备类型名称") + @Excel(name = "预警设备类型") + private String devTypeName; + + /** + * 设备名称 + */ + @ApiModelProperty(value="设备名称") + @Excel(name = "预警设备名称") + private String devName; + + /** + * 设备编码(唯一) + */ + @ApiModelProperty(value="设备编码(唯一)") + @Excel(name = "预警设备编号") + private String devCode; + + /** + * 是否告警 0 正常 1 告警 + */ + @ApiModelProperty(value="是否告警 0 正常 1 告警") + @Excel(name = "预警内容") + private String warnName; + + @ApiModelProperty(value="状态") + @Excel(name = "状态") + private String status; +} diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdRecordMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdRecordMapper.xml index 13d415f..1108bc8 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdRecordMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdRecordMapper.xml @@ -73,7 +73,7 @@ tbr.remarks as remarks, tbr.create_time as createTime, tbr.create_user as createUser, tbr.update_time as updateTime, tbr.update_user as updateUser, tbr.audit_user as auditUser, tbr.audit_time as auditTime, su.nick_name as auditUserName from tb_bd_record tbr - left join sys_user su on tbr.audit_user = su.id + left join sys_user su on tbr.audit_user = su.user_id where id = #{id} diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDevAttributeMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDevAttributeMapper.xml index 3292554..122a9d4 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDevAttributeMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDevAttributeMapper.xml @@ -27,6 +27,36 @@ where id = #{id,jdbcType=BIGINT} + + update tb_dev_attribute set del_flag = 1 where id = #{id,jdbcType=BIGINT} @@ -111,6 +141,7 @@ + update tb_dev_attribute @@ -145,6 +176,7 @@ where id = #{id,jdbcType=BIGINT} + update tb_dev_attribute @@ -222,10 +254,5 @@ - + \ No newline at end of file diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDeviceMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDeviceMapper.xml index 279bf2f..2c2ad5e 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDeviceMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDeviceMapper.xml @@ -282,7 +282,7 @@ select from tb_device - where 1=1 + where del_flag = 0 and (dev_name = #{devName} or dev_code = #{devCode})