From e388613fc85b1eacef2573f389cd36169c6d1f00 Mon Sep 17 00:00:00 2001 From: gaoxq <376340421@qq.com> Date: Sun, 7 Dec 2025 18:58:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jeesite/modules/app/Job/hostJob.java | 30 +- .../modules/biz/dao/BizWarningAlertDao.java | 15 + .../modules/biz/entity/BizWarningAlert.java | 118 +++++ .../biz/service/BizWarningAlertService.java | 134 +++++ .../biz/web/BizDeviceInfoController.java | 216 ++++---- .../biz/web/BizListItemController.java | 16 - .../biz/web/BizServerInfoController.java | 217 ++++---- .../biz/web/BizWarningAlertController.java | 163 ++++++ .../modules/biz/BizWarningAlertDao.xml | 15 + web-vue/packages/biz/api/biz/deviceInfo.ts | 3 + web-vue/packages/biz/api/biz/serverInfo.ts | 3 + web-vue/packages/biz/api/biz/warningAlert.ts | 59 +++ .../biz/views/biz/warningAlert/formImport.vue | 103 ++++ .../biz/views/biz/warningAlert/list.vue | 285 ++++++++++ .../header/components/notify/NoticeInfo.vue | 266 ++++++++++ .../header/components/notify/index.vue | 24 +- .../layouts/views/desktop/about/index.vue | 114 +--- .../desktop/analysis/components/Data.tsx | 156 ------ .../analysis/components/DynamicInfo.vue | 354 +++++++++++-- .../analysis/components/ProjectCard.vue | 241 ++++++--- .../analysis/components/QuickLogin.vue | 161 +++--- .../analysis/components/WarningAlert.vue | 319 ++++++++++++ .../analysis/components/WorkbenchHeader.vue | 2 +- .../analysis/components/info/ServerInfo.vue | 489 ++++++++++++++++++ .../analysis/components/info/WarningInfo.vue | 455 ++++++++++++++++ .../layouts/views/desktop/analysis/index.vue | 132 ++++- 26 files changed, 3368 insertions(+), 722 deletions(-) create mode 100644 web-api/src/main/java/com/jeesite/modules/biz/dao/BizWarningAlertDao.java create mode 100644 web-api/src/main/java/com/jeesite/modules/biz/entity/BizWarningAlert.java create mode 100644 web-api/src/main/java/com/jeesite/modules/biz/service/BizWarningAlertService.java create mode 100644 web-api/src/main/java/com/jeesite/modules/biz/web/BizWarningAlertController.java create mode 100644 web-api/src/main/resources/mappings/modules/biz/BizWarningAlertDao.xml create mode 100644 web-vue/packages/biz/api/biz/warningAlert.ts create mode 100644 web-vue/packages/biz/views/biz/warningAlert/formImport.vue create mode 100644 web-vue/packages/biz/views/biz/warningAlert/list.vue create mode 100644 web-vue/packages/core/layouts/default/header/components/notify/NoticeInfo.vue delete mode 100644 web-vue/packages/core/layouts/views/desktop/analysis/components/Data.tsx create mode 100644 web-vue/packages/core/layouts/views/desktop/analysis/components/WarningAlert.vue create mode 100644 web-vue/packages/core/layouts/views/desktop/analysis/components/info/ServerInfo.vue create mode 100644 web-vue/packages/core/layouts/views/desktop/analysis/components/info/WarningInfo.vue diff --git a/web-api/src/main/java/com/jeesite/modules/app/Job/hostJob.java b/web-api/src/main/java/com/jeesite/modules/app/Job/hostJob.java index 3ca0ab3d..2d33dca1 100644 --- a/web-api/src/main/java/com/jeesite/modules/app/Job/hostJob.java +++ b/web-api/src/main/java/com/jeesite/modules/app/Job/hostJob.java @@ -3,18 +3,9 @@ package com.jeesite.modules.app.Job; import com.jeesite.modules.app.dao.info.CpuInfo; import com.jeesite.modules.app.dao.info.DiskInfo; import com.jeesite.modules.app.dao.info.ServerInfo; -import com.jeesite.modules.app.utils.SystemUtil; -import com.jeesite.modules.app.utils.vo; -import com.jeesite.modules.biz.entity.BizDeviceInfo; -import com.jeesite.modules.biz.entity.BizMonitorAccount; -import com.jeesite.modules.biz.entity.BizMonitorHost; -import com.jeesite.modules.biz.entity.BizServerInfo; -import com.jeesite.modules.biz.service.BizDeviceInfoService; -import com.jeesite.modules.biz.service.BizMonitorAccountService; -import com.jeesite.modules.biz.service.BizMonitorHostService; -import com.jeesite.modules.app.utils.LoggerUtils; -import com.jeesite.modules.app.utils.NetworkUtils; -import com.jeesite.modules.biz.service.BizServerInfoService; +import com.jeesite.modules.app.utils.*; +import com.jeesite.modules.biz.entity.*; +import com.jeesite.modules.biz.service.*; import jakarta.annotation.Resource; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; @@ -38,6 +29,9 @@ public class hostJob { @Resource private BizDeviceInfoService deviceInfoService; + @Resource + private BizWarningAlertService bizWarningAlertService; + @Resource(name = "hostMonitorExecutor") private ThreadPoolTaskExecutor hostMonitorExecutor; @@ -102,6 +96,14 @@ public class hostJob { serverInfo.setLastOnlineTime(new Date()); serverInfo.setHostId(host.getHostId()); serverInfoService.save(serverInfo); + if (serverInfo.getCpuUsage() >= 60) { + BizWarningAlert warningAlert = new BizWarningAlert("ZJ_" + KeyUtil.ObjKey(12, 2), "CPU预警", 2, serverInfo.getHostname() + "CPU预警", "当前主机CPU已超过60%,请及时处理,主机IP：" + serverInfo.getIpAddress(), "业务系统", "0"); + bizWarningAlertService.save(warningAlert); + } + if (serverInfo.getMemoryUsage() >= 60) { + BizWarningAlert warningAlert = new BizWarningAlert("ZJ_" + KeyUtil.ObjKey(12, 2), "内存预警", 2, serverInfo.getHostname() + "内存预警", "当前主机内存已超过60%,请及时处理,主机IP：" + serverInfo.getIpAddress(), "业务系统", "0"); + bizWarningAlertService.save(warningAlert); + } } catch (Exception e) { logger.error(e.getMessage()); } @@ -128,6 +130,10 @@ public class hostJob { deviceInfo.setUsageRate(diskInfo.getUsageRate()); deviceInfo.setLastOnlineTime(new Date()); deviceInfoService.save(deviceInfo); + if (deviceInfo.getUsageRate() >= 60) { + BizWarningAlert warningAlert = new BizWarningAlert("ZJ_" + KeyUtil.ObjKey(12, 2), "磁盘预警", 2, host.getHostname() + "磁盘预警", "当前主机磁盘已超过60%,请及时处理,主机IP：" + host.getIpAddress() + ",设备名称:" + deviceInfo.getDevice() + ",挂载点:" + deviceInfo.getMountPoint() + ",总容量:" + deviceInfo.getTotalSize() + ",已使用容量:" + deviceInfo.getUsedSize() + ",当前使用率:" + deviceInfo.getUsageRate() + "%", "业务系统", "0"); + bizWarningAlertService.save(warningAlert); + } } catch (Exception e) { logger.error(e.getMessage()); } diff --git a/web-api/src/main/java/com/jeesite/modules/biz/dao/BizWarningAlertDao.java b/web-api/src/main/java/com/jeesite/modules/biz/dao/BizWarningAlertDao.java new file mode 100644 index 00000000..fd56bba0 --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/biz/dao/BizWarningAlertDao.java @@ -0,0 +1,15 @@ +package com.jeesite.modules.biz.dao; + +import com.jeesite.common.dao.CrudDao; +import com.jeesite.common.mybatis.annotation.MyBatisDao; +import com.jeesite.modules.biz.entity.BizWarningAlert; + +/** + * 预警信息DAO接口 + * @author gaoxq + * @version 2025-12-07 + */ +@MyBatisDao(dataSourceName="work") +public interface BizWarningAlertDao extends CrudDao { + +} \ No newline at end of file diff --git a/web-api/src/main/java/com/jeesite/modules/biz/entity/BizWarningAlert.java b/web-api/src/main/java/com/jeesite/modules/biz/entity/BizWarningAlert.java new file mode 100644 index 00000000..1b74a20e --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/biz/entity/BizWarningAlert.java @@ -0,0 +1,118 @@ +package com.jeesite.modules.biz.entity; + +import java.io.Serializable; +import java.util.Date; + +import com.jeesite.common.mybatis.annotation.JoinTable; +import com.jeesite.common.mybatis.annotation.JoinTable.Type; +import com.fasterxml.jackson.annotation.JsonFormat; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; + +import com.jeesite.common.entity.DataEntity; +import com.jeesite.common.mybatis.annotation.Column; +import com.jeesite.common.mybatis.annotation.Table; +import com.jeesite.common.mybatis.mapper.query.QueryType; +import com.jeesite.common.utils.excel.annotation.ExcelField; +import com.jeesite.common.utils.excel.annotation.ExcelField.Align; +import com.jeesite.common.utils.excel.annotation.ExcelFields; +import lombok.Data; + +import java.io.Serial; + +/** + * 预警信息Entity + * + * @author gaoxq + * @version 2025-12-07 + */ +@Table(name = "biz_warning_alert", alias = "a", label = "预警信息信息", columns = { + @Column(name = "create_time", attrName = "createTime", label = "创建时间", isUpdate = false), + @Column(name = "id", attrName = "id", label = "预警标识", isPK = true), + @Column(name = "alert_code", attrName = "alertCode", label = "预警编码"), + @Column(name = "alert_type", attrName = "alertType", label = "预警类型", isQuery = false), + @Column(name = "alert_level", attrName = "alertLevel", label = "预警级别"), + @Column(name = "alert_title", attrName = "alertTitle", label = "预警标题", queryType = QueryType.LIKE), + @Column(name = "alert_content", attrName = "alertContent", label = "预警详细内容", isQuery = false), + @Column(name = "trigger_time", attrName = "triggerTime", label = "预警触发时间", isQuery = false), + @Column(name = "source_system", attrName = "sourceSystem", label = "来源系统", queryType = QueryType.LIKE), + @Column(name = "alert_status", attrName = "alertStatus", label = "预警状态"), + @Column(name = "handler_user", attrName = "handlerUser", label = "处理人员", isQuery = false), + @Column(name = "handle_time", attrName = "handleTime", label = "处理时间", isQuery = false), + @Column(name = "handle_note", attrName = "handleNote", label = "处理备注", isQuery = false), + @Column(name = "update_time", attrName = "updateTime", label = "更新时间", isQuery = false, isUpdateForce = true), +}, orderBy = "a.create_time DESC" +) +@Data +public class BizWarningAlert extends DataEntity implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + private Date createTime; // 创建时间 + private String alertCode; // 预警编码 + private String alertType; // 预警类型 + private Integer alertLevel; // 预警级别 + private String alertTitle; // 预警标题 + private String alertContent; // 预警详细内容 + private Date triggerTime; // 预警触发时间 + private String sourceSystem; // 来源系统 + private String alertStatus; // 预警状态 + private String handlerUser; // 处理人员 + private Date handleTime; // 处理时间 + private String handleNote; // 处理备注 + private Date updateTime; // 更新时间 + + @ExcelFields({ + @ExcelField(title = "创建时间", attrName = "createTime", align = Align.CENTER, sort = 10, dataFormat = "yyyy-MM-dd hh:mm"), + @ExcelField(title = "预警标识", attrName = "id", align = Align.CENTER, sort = 20), + @ExcelField(title = "预警编码", attrName = "alertCode", align = Align.CENTER, sort = 30), + @ExcelField(title = "预警类型", attrName = "alertType", align = Align.CENTER, sort = 40), + @ExcelField(title = "预警级别", attrName = "alertLevel", dictType = "alert_level", align = Align.CENTER, sort = 50), + @ExcelField(title = "预警标题", attrName = "alertTitle", align = Align.CENTER, sort = 60), + @ExcelField(title = "预警内容", attrName = "alertContent", align = Align.CENTER, sort = 70), + @ExcelField(title = "预警时间", attrName = "triggerTime", align = Align.CENTER, sort = 80, dataFormat = "yyyy-MM-dd hh:mm"), + @ExcelField(title = "来源系统", attrName = "sourceSystem", align = Align.CENTER, sort = 90), + @ExcelField(title = "预警状态", attrName = "alertStatus", dictType = "alert_status", align = Align.CENTER, sort = 100), + @ExcelField(title = "处理人员", attrName = "handlerUser", align = Align.CENTER, sort = 110), + @ExcelField(title = "处理时间", attrName = "handleTime", align = Align.CENTER, sort = 120, dataFormat = "yyyy-MM-dd hh:mm"), + @ExcelField(title = "处理备注", attrName = "handleNote", align = Align.CENTER, sort = 130), + @ExcelField(title = "更新时间", attrName = "updateTime", align = Align.CENTER, sort = 140, dataFormat = "yyyy-MM-dd hh:mm"), + }) + public BizWarningAlert() { + this(null); + } + + public BizWarningAlert(String id) { + super(id); + } + + public BizWarningAlert(String alertCode, String alertType, Integer alertLevel, String alertTitle, String alertContent, String sourceSystem, String alertStatus) { + this.alertCode = alertCode; + this.alertType = alertType; + this.alertLevel = alertLevel; + this.alertTitle = alertTitle; + this.triggerTime = new Date(); + this.alertContent = alertContent; + this.sourceSystem = sourceSystem; + this.alertStatus = alertStatus; + } + + + public Date getCreateTime_gte() { + return sqlMap.getWhere().getValue("create_time", QueryType.GTE); + } + + public void setCreateTime_gte(Date createTime) { + sqlMap.getWhere().and("create_time", QueryType.GTE, createTime); + } + + public Date getCreateTime_lte() { + return sqlMap.getWhere().getValue("create_time", QueryType.LTE); + } + + public void setCreateTime_lte(Date createTime) { + sqlMap.getWhere().and("create_time", QueryType.LTE, createTime); + } + +} \ No newline at end of file diff --git a/web-api/src/main/java/com/jeesite/modules/biz/service/BizWarningAlertService.java b/web-api/src/main/java/com/jeesite/modules/biz/service/BizWarningAlertService.java new file mode 100644 index 00000000..0dba037f --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/biz/service/BizWarningAlertService.java @@ -0,0 +1,134 @@ +package com.jeesite.modules.biz.service; + +import java.util.List; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.jeesite.common.entity.Page; +import com.jeesite.common.service.CrudService; +import com.jeesite.modules.biz.entity.BizWarningAlert; +import com.jeesite.modules.biz.dao.BizWarningAlertDao; +import com.jeesite.common.service.ServiceException; +import com.jeesite.common.config.Global; +import com.jeesite.common.validator.ValidatorUtils; +import com.jeesite.common.utils.excel.ExcelImport; +import org.springframework.web.multipart.MultipartFile; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; + +/** + * 预警信息Service + * @author gaoxq + * @version 2025-12-07 + */ +@Service +public class BizWarningAlertService extends CrudService { + + /** + * 获取单条数据 + * @param bizWarningAlert 主键 + */ + @Override + public BizWarningAlert get(BizWarningAlert bizWarningAlert) { + return super.get(bizWarningAlert); + } + + /** + * 查询分页数据 + * @param bizWarningAlert 查询条件 + * @param bizWarningAlert page 分页对象 + */ + @Override + public Page findPage(BizWarningAlert bizWarningAlert) { + return super.findPage(bizWarningAlert); + } + + /** + * 查询列表数据 + * @param bizWarningAlert 查询条件 + */ + @Override + public List findList(BizWarningAlert bizWarningAlert) { + return super.findList(bizWarningAlert); + } + + /** + * 保存数据（插入或更新） + * @param bizWarningAlert 数据对象 + */ + @Override + @Transactional + public void save(BizWarningAlert bizWarningAlert) { + super.save(bizWarningAlert); + } + + /** + * 导入数据 + * @param file 导入的数据文件 + */ + @Transactional + public String importData(MultipartFile file) { + if (file == null){ + throw new ServiceException(text("请选择导入的数据文件！")); + } + int successNum = 0; int failureNum = 0; + StringBuilder successMsg = new StringBuilder(); + StringBuilder failureMsg = new StringBuilder(); + try(ExcelImport ei = new ExcelImport(file, 2, 0)){ + List list = ei.getDataList(BizWarningAlert.class); + for (BizWarningAlert bizWarningAlert : list) { + try{ + ValidatorUtils.validateWithException(bizWarningAlert); + this.save(bizWarningAlert); + successNum++; + successMsg.append("
" + successNum + "、编号 " + bizWarningAlert.getId() + " 导入成功"); + } catch (Exception e) { + failureNum++; + String msg = "
" + failureNum + "、编号 " + bizWarningAlert.getId() + " 导入失败："; + if (e instanceof ConstraintViolationException){ + ConstraintViolationException cve = (ConstraintViolationException)e; + for (ConstraintViolation violation : cve.getConstraintViolations()) { + msg += Global.getText(violation.getMessage()) + " ("+violation.getPropertyPath()+")"; + } + }else{ + msg += e.getMessage(); + } + failureMsg.append(msg); + logger.error(msg, e); + } + } + } catch (Exception e) { + logger.error(e.getMessage(), e); + failureMsg.append(e.getMessage()); + return failureMsg.toString(); + } + if (failureNum > 0) { + failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下："); + throw new ServiceException(failureMsg.toString()); + }else{ + successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下："); + } + return successMsg.toString(); + } + + /** + * 更新状态 + * @param bizWarningAlert 数据对象 + */ + @Override + @Transactional + public void updateStatus(BizWarningAlert bizWarningAlert) { + super.updateStatus(bizWarningAlert); + } + + /** + * 删除数据 + * @param bizWarningAlert 数据对象 + */ + @Override + @Transactional + public void delete(BizWarningAlert bizWarningAlert) { + super.delete(bizWarningAlert); + } + +} \ No newline at end of file diff --git a/web-api/src/main/java/com/jeesite/modules/biz/web/BizDeviceInfoController.java b/web-api/src/main/java/com/jeesite/modules/biz/web/BizDeviceInfoController.java index e9fa574b..3569a7ed 100644 --- a/web-api/src/main/java/com/jeesite/modules/biz/web/BizDeviceInfoController.java +++ b/web-api/src/main/java/com/jeesite/modules/biz/web/BizDeviceInfoController.java @@ -1,6 +1,7 @@ package com.jeesite.modules.biz.web; import java.util.List; + import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -26,6 +27,7 @@ import com.jeesite.modules.biz.service.BizDeviceInfoService; /** * 磁盘信息Controller + * * @author gaoxq * @version 2025-11-30 */ @@ -33,114 +35,120 @@ import com.jeesite.modules.biz.service.BizDeviceInfoService; @RequestMapping(value = "${adminPath}/biz/deviceInfo") public class BizDeviceInfoController extends BaseController { - private final BizDeviceInfoService bizDeviceInfoService; + private final BizDeviceInfoService bizDeviceInfoService; - public BizDeviceInfoController(BizDeviceInfoService bizDeviceInfoService) { - this.bizDeviceInfoService = bizDeviceInfoService; - } - - /** - * 获取数据 - */ - @ModelAttribute - public BizDeviceInfo get(String id, boolean isNewRecord) { - return bizDeviceInfoService.get(id, isNewRecord); - } - - /** - * 查询列表 - */ - @RequiresPermissions("biz:deviceInfo:view") - @RequestMapping(value = {"list", ""}) - public String list(BizDeviceInfo bizDeviceInfo, Model model) { - model.addAttribute("bizDeviceInfo", bizDeviceInfo); - return "modules/biz/bizDeviceInfoList"; - } - - /** - * 查询列表数据 - */ - @RequiresPermissions("biz:deviceInfo:view") - @RequestMapping(value = "listData") - @ResponseBody - public Page listData(BizDeviceInfo bizDeviceInfo, HttpServletRequest request, HttpServletResponse response) { - bizDeviceInfo.setPage(new Page<>(request, response)); - Page page = bizDeviceInfoService.findPage(bizDeviceInfo); - return page; - } + public BizDeviceInfoController(BizDeviceInfoService bizDeviceInfoService) { + this.bizDeviceInfoService = bizDeviceInfoService; + } - /** - * 查看编辑表单 - */ - @RequiresPermissions("biz:deviceInfo:view") - @RequestMapping(value = "form") - public String form(BizDeviceInfo bizDeviceInfo, Model model) { - model.addAttribute("bizDeviceInfo", bizDeviceInfo); - return "modules/biz/bizDeviceInfoForm"; - } + /** + * 获取数据 + */ + @ModelAttribute + public BizDeviceInfo get(String id, boolean isNewRecord) { + return bizDeviceInfoService.get(id, isNewRecord); + } - /** - * 保存数据 - */ - @RequiresPermissions("biz:deviceInfo:edit") - @PostMapping(value = "save") - @ResponseBody - public String save(@Validated BizDeviceInfo bizDeviceInfo) { - bizDeviceInfoService.save(bizDeviceInfo); - return renderResult(Global.TRUE, text("保存磁盘信息成功！")); - } + /** + * 查询列表 + */ + @RequiresPermissions("biz:deviceInfo:view") + @RequestMapping(value = {"list", ""}) + public String list(BizDeviceInfo bizDeviceInfo, Model model) { + model.addAttribute("bizDeviceInfo", bizDeviceInfo); + return "modules/biz/bizDeviceInfoList"; + } - /** - * 导出数据 - */ - @RequiresPermissions("biz:deviceInfo:view") - @RequestMapping(value = "exportData") - public void exportData(BizDeviceInfo bizDeviceInfo, HttpServletResponse response) { - List list = bizDeviceInfoService.findList(bizDeviceInfo); - String fileName = "磁盘信息" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx"; - try(ExcelExport ee = new ExcelExport("磁盘信息", BizDeviceInfo.class)){ - ee.setDataList(list).write(response, fileName); - } - } + /** + * 查询列表数据 + */ + @RequiresPermissions("biz:deviceInfo:view") + @RequestMapping(value = "listData") + @ResponseBody + public Page listData(BizDeviceInfo bizDeviceInfo, HttpServletRequest request, HttpServletResponse response) { + bizDeviceInfo.setPage(new Page<>(request, response)); + Page page = bizDeviceInfoService.findPage(bizDeviceInfo); + return page; + } - /** - * 下载模板 - */ - @RequiresPermissions("biz:deviceInfo:view") - @RequestMapping(value = "importTemplate") - public void importTemplate(HttpServletResponse response) { - BizDeviceInfo bizDeviceInfo = new BizDeviceInfo(); - List list = ListUtils.newArrayList(bizDeviceInfo); - String fileName = "磁盘信息模板.xlsx"; - try(ExcelExport ee = new ExcelExport("磁盘信息", BizDeviceInfo.class, Type.IMPORT)){ - ee.setDataList(list).write(response, fileName); - } - } + /** + * 查看编辑表单 + */ + @RequiresPermissions("biz:deviceInfo:view") + @RequestMapping(value = "form") + public String form(BizDeviceInfo bizDeviceInfo, Model model) { + model.addAttribute("bizDeviceInfo", bizDeviceInfo); + return "modules/biz/bizDeviceInfoForm"; + } - /** - * 导入数据 - */ - @ResponseBody - @RequiresPermissions("biz:deviceInfo:edit") - @PostMapping(value = "importData") - public String importData(MultipartFile file) { - try { - String message = bizDeviceInfoService.importData(file); - return renderResult(Global.TRUE, "posfull:"+message); - } catch (Exception ex) { - return renderResult(Global.FALSE, "posfull:"+ex.getMessage()); - } - } - - /** - * 删除数据 - */ - @RequiresPermissions("biz:deviceInfo:edit") - @RequestMapping(value = "delete") - @ResponseBody - public String delete(BizDeviceInfo bizDeviceInfo) { - bizDeviceInfoService.delete(bizDeviceInfo); - return renderResult(Global.TRUE, text("删除磁盘信息成功！")); - } - + /** + * 保存数据 + */ + @RequiresPermissions("biz:deviceInfo:edit") + @PostMapping(value = "save") + @ResponseBody + public String save(@Validated BizDeviceInfo bizDeviceInfo) { + bizDeviceInfoService.save(bizDeviceInfo); + return renderResult(Global.TRUE, text("保存磁盘信息成功！")); + } + + /** + * 导出数据 + */ + @RequiresPermissions("biz:deviceInfo:view") + @RequestMapping(value = "exportData") + public void exportData(BizDeviceInfo bizDeviceInfo, HttpServletResponse response) { + List list = bizDeviceInfoService.findList(bizDeviceInfo); + String fileName = "磁盘信息" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx"; + try (ExcelExport ee = new ExcelExport("磁盘信息", BizDeviceInfo.class)) { + ee.setDataList(list).write(response, fileName); + } + } + + /** + * 下载模板 + */ + @RequiresPermissions("biz:deviceInfo:view") + @RequestMapping(value = "importTemplate") + public void importTemplate(HttpServletResponse response) { + BizDeviceInfo bizDeviceInfo = new BizDeviceInfo(); + List list = ListUtils.newArrayList(bizDeviceInfo); + String fileName = "磁盘信息模板.xlsx"; + try (ExcelExport ee = new ExcelExport("磁盘信息", BizDeviceInfo.class, Type.IMPORT)) { + ee.setDataList(list).write(response, fileName); + } + } + + /** + * 导入数据 + */ + @ResponseBody + @RequiresPermissions("biz:deviceInfo:edit") + @PostMapping(value = "importData") + public String importData(MultipartFile file) { + try { + String message = bizDeviceInfoService.importData(file); + return renderResult(Global.TRUE, "posfull:" + message); + } catch (Exception ex) { + return renderResult(Global.FALSE, "posfull:" + ex.getMessage()); + } + } + + /** + * 删除数据 + */ + @RequiresPermissions("biz:deviceInfo:edit") + @RequestMapping(value = "delete") + @ResponseBody + public String delete(BizDeviceInfo bizDeviceInfo) { + bizDeviceInfoService.delete(bizDeviceInfo); + return renderResult(Global.TRUE, text("删除磁盘信息成功！")); + } + + + @RequestMapping(value = "listAll") + @ResponseBody + public List listAll(BizDeviceInfo bizDeviceInfo) { + return bizDeviceInfoService.findList(bizDeviceInfo); + } } \ No newline at end of file diff --git a/web-api/src/main/java/com/jeesite/modules/biz/web/BizListItemController.java b/web-api/src/main/java/com/jeesite/modules/biz/web/BizListItemController.java index 9040d667..958b1f38 100644 --- a/web-api/src/main/java/com/jeesite/modules/biz/web/BizListItemController.java +++ b/web-api/src/main/java/com/jeesite/modules/biz/web/BizListItemController.java @@ -165,22 +165,6 @@ public class BizListItemController extends BaseController { @RequestMapping(value = "sflow") @ResponseBody public String sflow(BizListItem bizListItem) { - String status = Objects.requireNonNullElse(bizListItem.getExtra(), "未开始"); - switch (status) { - case "未开始" -> { - bizListItem.setColor("red"); - bizListItem.setExtra("进行中"); - } - case "进行中" -> { - bizListItem.setColor("green"); - bizListItem.setExtra("已完成"); - } - case "已完成" -> { - bizListItem.setColor("white"); - bizListItem.setReadFlag(true); - bizListItem.setClickClose(true); - } - } bizListItemService.update(bizListItem); return renderResult(Global.TRUE, text("操作通知列表项成功！")); } diff --git a/web-api/src/main/java/com/jeesite/modules/biz/web/BizServerInfoController.java b/web-api/src/main/java/com/jeesite/modules/biz/web/BizServerInfoController.java index 2a91444f..f84d9b57 100644 --- a/web-api/src/main/java/com/jeesite/modules/biz/web/BizServerInfoController.java +++ b/web-api/src/main/java/com/jeesite/modules/biz/web/BizServerInfoController.java @@ -1,6 +1,7 @@ package com.jeesite.modules.biz.web; import java.util.List; + import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -26,6 +27,7 @@ import com.jeesite.modules.biz.service.BizServerInfoService; /** * 运行信息Controller + * * @author gaoxq * @version 2025-11-30 */ @@ -33,114 +35,121 @@ import com.jeesite.modules.biz.service.BizServerInfoService; @RequestMapping(value = "${adminPath}/biz/serverInfo") public class BizServerInfoController extends BaseController { - private final BizServerInfoService bizServerInfoService; + private final BizServerInfoService bizServerInfoService; - public BizServerInfoController(BizServerInfoService bizServerInfoService) { - this.bizServerInfoService = bizServerInfoService; - } - - /** - * 获取数据 - */ - @ModelAttribute - public BizServerInfo get(String id, boolean isNewRecord) { - return bizServerInfoService.get(id, isNewRecord); - } - - /** - * 查询列表 - */ - @RequiresPermissions("biz:serverInfo:view") - @RequestMapping(value = {"list", ""}) - public String list(BizServerInfo bizServerInfo, Model model) { - model.addAttribute("bizServerInfo", bizServerInfo); - return "modules/biz/bizServerInfoList"; - } - - /** - * 查询列表数据 - */ - @RequiresPermissions("biz:serverInfo:view") - @RequestMapping(value = "listData") - @ResponseBody - public Page listData(BizServerInfo bizServerInfo, HttpServletRequest request, HttpServletResponse response) { - bizServerInfo.setPage(new Page<>(request, response)); - Page page = bizServerInfoService.findPage(bizServerInfo); - return page; - } + public BizServerInfoController(BizServerInfoService bizServerInfoService) { + this.bizServerInfoService = bizServerInfoService; + } - /** - * 查看编辑表单 - */ - @RequiresPermissions("biz:serverInfo:view") - @RequestMapping(value = "form") - public String form(BizServerInfo bizServerInfo, Model model) { - model.addAttribute("bizServerInfo", bizServerInfo); - return "modules/biz/bizServerInfoForm"; - } + /** + * 获取数据 + */ + @ModelAttribute + public BizServerInfo get(String id, boolean isNewRecord) { + return bizServerInfoService.get(id, isNewRecord); + } - /** - * 保存数据 - */ - @RequiresPermissions("biz:serverInfo:edit") - @PostMapping(value = "save") - @ResponseBody - public String save(@Validated BizServerInfo bizServerInfo) { - bizServerInfoService.save(bizServerInfo); - return renderResult(Global.TRUE, text("保存运行信息成功！")); - } + /** + * 查询列表 + */ + @RequiresPermissions("biz:serverInfo:view") + @RequestMapping(value = {"list", ""}) + public String list(BizServerInfo bizServerInfo, Model model) { + model.addAttribute("bizServerInfo", bizServerInfo); + return "modules/biz/bizServerInfoList"; + } - /** - * 导出数据 - */ - @RequiresPermissions("biz:serverInfo:view") - @RequestMapping(value = "exportData") - public void exportData(BizServerInfo bizServerInfo, HttpServletResponse response) { - List list = bizServerInfoService.findList(bizServerInfo); - String fileName = "运行信息" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx"; - try(ExcelExport ee = new ExcelExport("运行信息", BizServerInfo.class)){ - ee.setDataList(list).write(response, fileName); - } - } + /** + * 查询列表数据 + */ + @RequiresPermissions("biz:serverInfo:view") + @RequestMapping(value = "listData") + @ResponseBody + public Page listData(BizServerInfo bizServerInfo, HttpServletRequest request, HttpServletResponse response) { + bizServerInfo.setPage(new Page<>(request, response)); + Page page = bizServerInfoService.findPage(bizServerInfo); + return page; + } - /** - * 下载模板 - */ - @RequiresPermissions("biz:serverInfo:view") - @RequestMapping(value = "importTemplate") - public void importTemplate(HttpServletResponse response) { - BizServerInfo bizServerInfo = new BizServerInfo(); - List list = ListUtils.newArrayList(bizServerInfo); - String fileName = "运行信息模板.xlsx"; - try(ExcelExport ee = new ExcelExport("运行信息", BizServerInfo.class, Type.IMPORT)){ - ee.setDataList(list).write(response, fileName); - } - } + /** + * 查看编辑表单 + */ + @RequiresPermissions("biz:serverInfo:view") + @RequestMapping(value = "form") + public String form(BizServerInfo bizServerInfo, Model model) { + model.addAttribute("bizServerInfo", bizServerInfo); + return "modules/biz/bizServerInfoForm"; + } + + /** + * 保存数据 + */ + @RequiresPermissions("biz:serverInfo:edit") + @PostMapping(value = "save") + @ResponseBody + public String save(@Validated BizServerInfo bizServerInfo) { + bizServerInfoService.save(bizServerInfo); + return renderResult(Global.TRUE, text("保存运行信息成功！")); + } + + /** + * 导出数据 + */ + @RequiresPermissions("biz:serverInfo:view") + @RequestMapping(value = "exportData") + public void exportData(BizServerInfo bizServerInfo, HttpServletResponse response) { + List list = bizServerInfoService.findList(bizServerInfo); + String fileName = "运行信息" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx"; + try (ExcelExport ee = new ExcelExport("运行信息", BizServerInfo.class)) { + ee.setDataList(list).write(response, fileName); + } + } + + /** + * 下载模板 + */ + @RequiresPermissions("biz:serverInfo:view") + @RequestMapping(value = "importTemplate") + public void importTemplate(HttpServletResponse response) { + BizServerInfo bizServerInfo = new BizServerInfo(); + List list = ListUtils.newArrayList(bizServerInfo); + String fileName = "运行信息模板.xlsx"; + try (ExcelExport ee = new ExcelExport("运行信息", BizServerInfo.class, Type.IMPORT)) { + ee.setDataList(list).write(response, fileName); + } + } + + /** + * 导入数据 + */ + @ResponseBody + @RequiresPermissions("biz:serverInfo:edit") + @PostMapping(value = "importData") + public String importData(MultipartFile file) { + try { + String message = bizServerInfoService.importData(file); + return renderResult(Global.TRUE, "posfull:" + message); + } catch (Exception ex) { + return renderResult(Global.FALSE, "posfull:" + ex.getMessage()); + } + } + + /** + * 删除数据 + */ + @RequiresPermissions("biz:serverInfo:edit") + @RequestMapping(value = "delete") + @ResponseBody + public String delete(BizServerInfo bizServerInfo) { + bizServerInfoService.delete(bizServerInfo); + return renderResult(Global.TRUE, text("删除运行信息成功！")); + } + + + @RequestMapping(value = "listAll") + @ResponseBody + public List listAll(BizServerInfo bizServerInfo) { + return bizServerInfoService.findList(bizServerInfo); + } - /** - * 导入数据 - */ - @ResponseBody - @RequiresPermissions("biz:serverInfo:edit") - @PostMapping(value = "importData") - public String importData(MultipartFile file) { - try { - String message = bizServerInfoService.importData(file); - return renderResult(Global.TRUE, "posfull:"+message); - } catch (Exception ex) { - return renderResult(Global.FALSE, "posfull:"+ex.getMessage()); - } - } - - /** - * 删除数据 - */ - @RequiresPermissions("biz:serverInfo:edit") - @RequestMapping(value = "delete") - @ResponseBody - public String delete(BizServerInfo bizServerInfo) { - bizServerInfoService.delete(bizServerInfo); - return renderResult(Global.TRUE, text("删除运行信息成功！")); - } - } \ No newline at end of file diff --git a/web-api/src/main/java/com/jeesite/modules/biz/web/BizWarningAlertController.java b/web-api/src/main/java/com/jeesite/modules/biz/web/BizWarningAlertController.java new file mode 100644 index 00000000..f14924ca --- /dev/null +++ b/web-api/src/main/java/com/jeesite/modules/biz/web/BizWarningAlertController.java @@ -0,0 +1,163 @@ +package com.jeesite.modules.biz.web; + +import java.util.Date; +import java.util.List; + +import com.jeesite.modules.sys.entity.User; +import com.jeesite.modules.sys.utils.UserUtils; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import com.jeesite.common.config.Global; +import com.jeesite.common.collect.ListUtils; +import com.jeesite.common.entity.Page; +import com.jeesite.common.lang.DateUtils; +import com.jeesite.common.utils.excel.ExcelExport; +import com.jeesite.common.utils.excel.annotation.ExcelField.Type; +import org.springframework.web.multipart.MultipartFile; +import com.jeesite.common.web.BaseController; +import com.jeesite.modules.biz.entity.BizWarningAlert; +import com.jeesite.modules.biz.service.BizWarningAlertService; + +/** + * 预警信息Controller + * + * @author gaoxq + * @version 2025-12-07 + */ +@Controller +@RequestMapping(value = "${adminPath}/biz/warningAlert") +public class BizWarningAlertController extends BaseController { + + private final BizWarningAlertService bizWarningAlertService; + + public BizWarningAlertController(BizWarningAlertService bizWarningAlertService) { + this.bizWarningAlertService = bizWarningAlertService; + } + + /** + * 获取数据 + */ + @ModelAttribute + public BizWarningAlert get(String id, boolean isNewRecord) { + return bizWarningAlertService.get(id, isNewRecord); + } + + /** + * 查询列表 + */ + @RequiresPermissions("biz:warningAlert:view") + @RequestMapping(value = {"list", ""}) + public String list(BizWarningAlert bizWarningAlert, Model model) { + model.addAttribute("bizWarningAlert", bizWarningAlert); + return "modules/biz/bizWarningAlertList"; + } + + /** + * 查询列表数据 + */ + @RequiresPermissions("biz:warningAlert:view") + @RequestMapping(value = "listData") + @ResponseBody + public Page listData(BizWarningAlert bizWarningAlert, HttpServletRequest request, HttpServletResponse response) { + bizWarningAlert.setPage(new Page<>(request, response)); + Page page = bizWarningAlertService.findPage(bizWarningAlert); + return page; + } + + /** + * 查看编辑表单 + */ + @RequiresPermissions("biz:warningAlert:view") + @RequestMapping(value = "form") + public String form(BizWarningAlert bizWarningAlert, Model model) { + model.addAttribute("bizWarningAlert", bizWarningAlert); + return "modules/biz/bizWarningAlertForm"; + } + + /** + * 保存数据 + */ + @RequiresPermissions("biz:warningAlert:edit") + @PostMapping(value = "save") + @ResponseBody + public String save(@Validated BizWarningAlert bizWarningAlert) { + if (!bizWarningAlert.getIsNewRecord()) { + User user = UserUtils.getUser(); + bizWarningAlert.setHandlerUser(user.getUserName() + "(" + user.getLoginCode() + ")"); + bizWarningAlert.setHandleTime(new Date()); + } + bizWarningAlertService.save(bizWarningAlert); + return renderResult(Global.TRUE, text("保存预警信息成功！")); + } + + /** + * 导出数据 + */ + @RequiresPermissions("biz:warningAlert:view") + @RequestMapping(value = "exportData") + public void exportData(BizWarningAlert bizWarningAlert, HttpServletResponse response) { + List list = bizWarningAlertService.findList(bizWarningAlert); + String fileName = "预警信息" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx"; + try (ExcelExport ee = new ExcelExport("预警信息", BizWarningAlert.class)) { + ee.setDataList(list).write(response, fileName); + } + } + + /** + * 下载模板 + */ + @RequiresPermissions("biz:warningAlert:view") + @RequestMapping(value = "importTemplate") + public void importTemplate(HttpServletResponse response) { + BizWarningAlert bizWarningAlert = new BizWarningAlert(); + List list = ListUtils.newArrayList(bizWarningAlert); + String fileName = "预警信息模板.xlsx"; + try (ExcelExport ee = new ExcelExport("预警信息", BizWarningAlert.class, Type.IMPORT)) { + ee.setDataList(list).write(response, fileName); + } + } + + /** + * 导入数据 + */ + @ResponseBody + @RequiresPermissions("biz:warningAlert:edit") + @PostMapping(value = "importData") + public String importData(MultipartFile file) { + try { + String message = bizWarningAlertService.importData(file); + return renderResult(Global.TRUE, "posfull:" + message); + } catch (Exception ex) { + return renderResult(Global.FALSE, "posfull:" + ex.getMessage()); + } + } + + /** + * 删除数据 + */ + @RequiresPermissions("biz:warningAlert:edit") + @RequestMapping(value = "delete") + @ResponseBody + public String delete(BizWarningAlert bizWarningAlert) { + bizWarningAlertService.delete(bizWarningAlert); + return renderResult(Global.TRUE, text("删除预警信息成功！")); + } + + + @RequestMapping(value = "listAll") + @ResponseBody + public List listAll(BizWarningAlert bizWarningAlert) { + return bizWarningAlertService.findList(bizWarningAlert); + } + +} \ No newline at end of file diff --git a/web-api/src/main/resources/mappings/modules/biz/BizWarningAlertDao.xml b/web-api/src/main/resources/mappings/modules/biz/BizWarningAlertDao.xml new file mode 100644 index 00000000..a061481d --- /dev/null +++ b/web-api/src/main/resources/mappings/modules/biz/BizWarningAlertDao.xml @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/web-vue/packages/biz/api/biz/deviceInfo.ts b/web-vue/packages/biz/api/biz/deviceInfo.ts index e095d18c..f06aa790 100644 --- a/web-vue/packages/biz/api/biz/deviceInfo.ts +++ b/web-vue/packages/biz/api/biz/deviceInfo.ts @@ -25,6 +25,9 @@ export interface BizDeviceInfo extends BasicModel { export const bizDeviceInfoList = (params?: BizDeviceInfo | any) => defHttp.get({ url: adminPath + '/biz/deviceInfo/list', params }); + +export const bizDeviceInfoListAll = (params?: BizDeviceInfo | any) => + defHttp.get({ url: adminPath + '/biz/deviceInfo/listAll', params }); export const bizDeviceInfoListData = (params?: BizDeviceInfo | any) => defHttp.post>({ url: adminPath + '/biz/deviceInfo/listData', params }); diff --git a/web-vue/packages/biz/api/biz/serverInfo.ts b/web-vue/packages/biz/api/biz/serverInfo.ts index 067d62c2..f27c889c 100644 --- a/web-vue/packages/biz/api/biz/serverInfo.ts +++ b/web-vue/packages/biz/api/biz/serverInfo.ts @@ -29,6 +29,9 @@ export interface BizServerInfo extends BasicModel { export const bizServerInfoList = (params?: BizServerInfo | any) => defHttp.get({ url: adminPath + '/biz/serverInfo/list', params }); + +export const bizServerInfoListAll = (params?: BizServerInfo | any) => + defHttp.get({ url: adminPath + '/biz/serverInfo/listAll', params }); export const bizServerInfoListData = (params?: BizServerInfo | any) => defHttp.post>({ url: adminPath + '/biz/serverInfo/listData', params }); diff --git a/web-vue/packages/biz/api/biz/warningAlert.ts b/web-vue/packages/biz/api/biz/warningAlert.ts new file mode 100644 index 00000000..4741e966 --- /dev/null +++ b/web-vue/packages/biz/api/biz/warningAlert.ts @@ -0,0 +1,59 @@ +/** + * Copyright (c) 2013-Now http://jeesite.com All rights reserved. + * No deletion without permission, or be held responsible to law. + * @author gaoxq + */ +import { defHttp } from '@jeesite/core/utils/http/axios'; +import { useGlobSetting } from '@jeesite/core/hooks/setting'; +import { BasicModel, Page } from '@jeesite/core/api/model/baseModel'; +import { UploadApiResult } from '@jeesite/core/api/sys/upload'; +import { UploadFileParams } from '@jeesite/types/axios'; +import { AxiosProgressEvent } from 'axios'; + +const { ctxPath, adminPath } = useGlobSetting(); + +export interface BizWarningAlert extends BasicModel { + createTime: string; // 创建时间 + alertCode: string; // 预警编码 + alertType: string; // 预警类型 + alertLevel: number; // 预警级别 + alertTitle: string; // 预警标题 + alertContent: string; // 预警详细内容 + triggerTime: string; // 预警触发时间 + sourceSystem?: string; // 来源系统 + alertStatus: string; // 预警状态 + handlerUser?: string; // 处理人员 + handleTime: string; // 处理时间 + handleNote: string; // 处理备注 + updateTime?: string; // 更新时间 +} + +export const bizWarningAlertList = (params?: BizWarningAlert | any) => + defHttp.get({ url: adminPath + '/biz/warningAlert/list', params }); + +export const bizWarningAlertListAll = (params?: BizWarningAlert | any) => + defHttp.get({ url: adminPath + '/biz/warningAlert/listAll', params }); + +export const bizWarningAlertListData = (params?: BizWarningAlert | any) => + defHttp.post>({ url: adminPath + '/biz/warningAlert/listData', params }); + +export const bizWarningAlertForm = (params?: BizWarningAlert | any) => + defHttp.get({ url: adminPath + '/biz/warningAlert/form', params }); + +export const bizWarningAlertSave = (params?: any, data?: BizWarningAlert | any) => + defHttp.postJson({ url: adminPath + '/biz/warningAlert/save', params, data }); + +export const bizWarningAlertImportData = ( + params: UploadFileParams, + onUploadProgress: (progressEvent: AxiosProgressEvent) => void, +) => + defHttp.uploadFile( + { + url: ctxPath + adminPath + '/biz/warningAlert/importData', + onUploadProgress, + }, + params, + ); + +export const bizWarningAlertDelete = (params?: BizWarningAlert | any) => + defHttp.get({ url: adminPath + '/biz/warningAlert/delete', params }); diff --git a/web-vue/packages/biz/views/biz/warningAlert/formImport.vue b/web-vue/packages/biz/views/biz/warningAlert/formImport.vue new file mode 100644 index 00000000..328a2e27 --- /dev/null +++ b/web-vue/packages/biz/views/biz/warningAlert/formImport.vue @@ -0,0 +1,103 @@ + + + diff --git a/web-vue/packages/biz/views/biz/warningAlert/list.vue b/web-vue/packages/biz/views/biz/warningAlert/list.vue new file mode 100644 index 00000000..fb2935fd --- /dev/null +++ b/web-vue/packages/biz/views/biz/warningAlert/list.vue @@ -0,0 +1,285 @@ + + + diff --git a/web-vue/packages/core/layouts/default/header/components/notify/NoticeInfo.vue b/web-vue/packages/core/layouts/default/header/components/notify/NoticeInfo.vue new file mode 100644 index 00000000..69cb6f4c --- /dev/null +++ b/web-vue/packages/core/layouts/default/header/components/notify/NoticeInfo.vue @@ -0,0 +1,266 @@ +