From 5d9219cd03495c858f652fb128be533430576bf1 Mon Sep 17 00:00:00 2001 From: gjh <1421wake> Date: Tue, 8 Jul 2025 11:56:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=99=E7=82=B9=E8=81=94=E7=BD=91=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=88=86=E6=9E=90=E8=A1=A8=E5=9F=BA=E7=A1=80=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WebSiteNetDataAnalysisController.java | 105 ++++++++++++++ .../demo/domain/WebSiteNetDataAnalysis.java | 82 +++++++++++ .../domain/bo/WebSiteNetDataAnalysisBo.java | 83 +++++++++++ .../domain/vo/WebSiteNetDataAnalysisVo.java | 92 ++++++++++++ .../mapper/WebSiteNetDataAnalysisMapper.java | 15 ++ .../IWebSiteNetDataAnalysisService.java | 68 +++++++++ .../WebSiteNetDataAnalysisServiceImpl.java | 136 ++++++++++++++++++ 7 files changed, 581 insertions(+) create mode 100644 ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WebSiteNetDataAnalysisController.java create mode 100644 ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/WebSiteNetDataAnalysis.java create mode 100644 ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/WebSiteNetDataAnalysisBo.java create mode 100644 ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/WebSiteNetDataAnalysisVo.java create mode 100644 ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/WebSiteNetDataAnalysisMapper.java create mode 100644 ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IWebSiteNetDataAnalysisService.java create mode 100644 ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/WebSiteNetDataAnalysisServiceImpl.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WebSiteNetDataAnalysisController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WebSiteNetDataAnalysisController.java new file mode 100644 index 0000000..2bf41ed --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WebSiteNetDataAnalysisController.java @@ -0,0 +1,105 @@ +package org.dromara.demo.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.demo.domain.vo.WebSiteNetDataAnalysisVo; +import org.dromara.demo.domain.bo.WebSiteNetDataAnalysisBo; +import org.dromara.demo.service.IWebSiteNetDataAnalysisService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 站点联网数据分析 + * + * @author gejunhao + * @date 2025-07-08 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/air/webSiteNetDataAnalysis") +public class WebSiteNetDataAnalysisController extends BaseController { + + private final IWebSiteNetDataAnalysisService webSiteNetDataAnalysisService; + + /** + * 查询站点联网数据分析列表 + */ + //@SaCheckPermission("air:siteNetDataAnalysis:list") + @GetMapping("/list") + public TableDataInfo list(WebSiteNetDataAnalysisBo bo, PageQuery pageQuery) { + return webSiteNetDataAnalysisService.queryPageList(bo, pageQuery); + } + + /** + * 导出站点联网数据分析列表 + */ + //@SaCheckPermission("air:siteNetDataAnalysis:export") + @Log(title = "站点联网数据分析", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WebSiteNetDataAnalysisBo bo, HttpServletResponse response) { + List list = webSiteNetDataAnalysisService.queryList(bo); + ExcelUtil.exportExcel(list, "站点联网数据分析", WebSiteNetDataAnalysisVo.class, response); + } + + /** + * 获取站点联网数据分析详细信息 + * + * @param id 主键 + */ + //@SaCheckPermission("air:siteNetDataAnalysis:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable String id) { + return R.ok(webSiteNetDataAnalysisService.queryById(id)); + } + + /** + * 新增站点联网数据分析 + */ + //@SaCheckPermission("air:siteNetDataAnalysis:add") + @Log(title = "站点联网数据分析", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WebSiteNetDataAnalysisBo bo) { + return toAjax(webSiteNetDataAnalysisService.insertByBo(bo)); + } + + /** + * 修改站点联网数据分析 + */ + //@SaCheckPermission("air:siteNetDataAnalysis:edit") + @Log(title = "站点联网数据分析", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WebSiteNetDataAnalysisBo bo) { + return toAjax(webSiteNetDataAnalysisService.updateByBo(bo)); + } + + /** + * 删除站点联网数据分析 + * + * @param ids 主键串 + */ + //@SaCheckPermission("air:siteNetDataAnalysis:remove") + @Log(title = "站点联网数据分析", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable String[] ids) { + return toAjax(webSiteNetDataAnalysisService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/WebSiteNetDataAnalysis.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/WebSiteNetDataAnalysis.java new file mode 100644 index 0000000..782f655 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/WebSiteNetDataAnalysis.java @@ -0,0 +1,82 @@ +package org.dromara.demo.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serial; + +/** + * 站点联网数据分析对象 web_site_net_data_analysis + * + * @author gejunhao + * @date 2025-07-08 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("web_site_net_data_analysis") +public class WebSiteNetDataAnalysis extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private String id; + + /** + * 站点名称 + */ + private String station; + + /** + * 所属区域 + */ + private String area; + + /** + * 当前状态（如：运行中、维护中、离线） + */ + private String status; + + /** + * 运维单位 + */ + private String ioCompany; + + /** + * 监理单位 + */ + private String monitorCompany; + + /** + * 本月应收数据金额 + */ + private Long planIncome; + + /** + * 本月实收数据金额 + */ + private Long actualIncome; + + /** + * 最新数据更新时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date lastTime; + + /** + * 删除标志（0：未删除；1：已删除） + */ + @TableLogic + private Long delFlag; + + +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/WebSiteNetDataAnalysisBo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/WebSiteNetDataAnalysisBo.java new file mode 100644 index 0000000..624a8fd --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/WebSiteNetDataAnalysisBo.java @@ -0,0 +1,83 @@ +package org.dromara.demo.domain.bo; + +import org.dromara.demo.domain.WebSiteNetDataAnalysis; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + +/** + * 站点联网数据分析业务对象 web_site_net_data_analysis + * + * @author gejunhao + * @date 2025-07-08 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = WebSiteNetDataAnalysis.class, reverseConvertGenerate = false) +public class WebSiteNetDataAnalysisBo extends BaseEntity { + + /** + * 主键ID + */ + //@NotBlank(message = "主键ID不能为空", groups = { EditGroup.class }) + private String id; + + /** + * 站点名称 + */ + //@NotBlank(message = "站点名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String station; + + /** + * 所属区域 + */ + //@NotBlank(message = "所属区域不能为空", groups = { AddGroup.class, EditGroup.class }) + private String area; + + /** + * 当前状态（如：运行中、维护中、离线） + */ + //@NotBlank(message = "当前状态（如：运行中、维护中、离线）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String status; + + /** + * 运维单位 + */ + //@NotBlank(message = "运维单位不能为空", groups = { AddGroup.class, EditGroup.class }) + private String ioCompany; + + /** + * 监理单位 + */ + //@NotBlank(message = "监理单位不能为空", groups = { AddGroup.class, EditGroup.class }) + private String monitorCompany; + + /** + * 本月应收数据金额 + */ + //@NotNull(message = "本月应收数据金额不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long planIncome; + + /** + * 本月实收数据金额 + */ + //@NotNull(message = "本月实收数据金额不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long actualIncome; + + /** + * 最新数据更新时间 + */ + //@NotNull(message = "最新数据更新时间不能为空", groups = { AddGroup.class, EditGroup.class }) + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date lastTime; + + +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/WebSiteNetDataAnalysisVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/WebSiteNetDataAnalysisVo.java new file mode 100644 index 0000000..53796f2 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/WebSiteNetDataAnalysisVo.java @@ -0,0 +1,92 @@ +package org.dromara.demo.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.demo.domain.WebSiteNetDataAnalysis; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 站点联网数据分析视图对象 web_site_net_data_analysis + * + * @author gejunhao + * @date 2025-07-08 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = WebSiteNetDataAnalysis.class) +public class WebSiteNetDataAnalysisVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private String id; + + /** + * 站点名称 + */ + @ExcelProperty(value = "站点名称") + private String station; + + /** + * 所属区域 + */ + @ExcelProperty(value = "所属区域") + private String area; + + /** + * 当前状态（如：运行中、维护中、离线） + */ + @ExcelProperty(value = "当前状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "如=：运行中、维护中、离线") + private String status; + + /** + * 运维单位 + */ + @ExcelProperty(value = "运维单位") + private String ioCompany; + + /** + * 监理单位 + */ + @ExcelProperty(value = "监理单位") + private String monitorCompany; + + /** + * 本月应收数据金额 + */ + @ExcelProperty(value = "本月应收数据金额") + private Long planIncome; + + /** + * 本月实收数据金额 + */ + @ExcelProperty(value = "本月实收数据金额") + private Long actualIncome; + + /** + * 最新数据更新时间 + */ + @ExcelProperty(value = "最新数据更新时间") + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date lastTime; + + +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/WebSiteNetDataAnalysisMapper.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/WebSiteNetDataAnalysisMapper.java new file mode 100644 index 0000000..0619326 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/WebSiteNetDataAnalysisMapper.java @@ -0,0 +1,15 @@ +package org.dromara.demo.mapper; + +import org.dromara.demo.domain.WebSiteNetDataAnalysis; +import org.dromara.demo.domain.vo.WebSiteNetDataAnalysisVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 站点联网数据分析Mapper接口 + * + * @author gejunhao + * @date 2025-07-08 + */ +public interface WebSiteNetDataAnalysisMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IWebSiteNetDataAnalysisService.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IWebSiteNetDataAnalysisService.java new file mode 100644 index 0000000..aa578d9 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IWebSiteNetDataAnalysisService.java @@ -0,0 +1,68 @@ +package org.dromara.demo.service; + +import org.dromara.demo.domain.vo.WebSiteNetDataAnalysisVo; +import org.dromara.demo.domain.bo.WebSiteNetDataAnalysisBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 站点联网数据分析Service接口 + * + * @author gejunhao + * @date 2025-07-08 + */ +public interface IWebSiteNetDataAnalysisService { + + /** + * 查询站点联网数据分析 + * + * @param id 主键 + * @return 站点联网数据分析 + */ + WebSiteNetDataAnalysisVo queryById(String id); + + /** + * 分页查询站点联网数据分析列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 站点联网数据分析分页列表 + */ + TableDataInfo queryPageList(WebSiteNetDataAnalysisBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的站点联网数据分析列表 + * + * @param bo 查询条件 + * @return 站点联网数据分析列表 + */ + List queryList(WebSiteNetDataAnalysisBo bo); + + /** + * 新增站点联网数据分析 + * + * @param bo 站点联网数据分析 + * @return 是否新增成功 + */ + Boolean insertByBo(WebSiteNetDataAnalysisBo bo); + + /** + * 修改站点联网数据分析 + * + * @param bo 站点联网数据分析 + * @return 是否修改成功 + */ + Boolean updateByBo(WebSiteNetDataAnalysisBo bo); + + /** + * 校验并批量删除站点联网数据分析信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/WebSiteNetDataAnalysisServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/WebSiteNetDataAnalysisServiceImpl.java new file mode 100644 index 0000000..2ea1136 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/WebSiteNetDataAnalysisServiceImpl.java @@ -0,0 +1,136 @@ +package org.dromara.demo.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.demo.domain.bo.WebSiteNetDataAnalysisBo; +import org.dromara.demo.domain.vo.WebSiteNetDataAnalysisVo; +import org.dromara.demo.domain.WebSiteNetDataAnalysis; +import org.dromara.demo.mapper.WebSiteNetDataAnalysisMapper; +import org.dromara.demo.service.IWebSiteNetDataAnalysisService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 站点联网数据分析Service业务层处理 + * + * @author gejunhao + * @date 2025-07-08 + */ +@RequiredArgsConstructor +@Service +public class WebSiteNetDataAnalysisServiceImpl implements IWebSiteNetDataAnalysisService { + + private final WebSiteNetDataAnalysisMapper baseMapper; + + /** + * 查询站点联网数据分析 + * + * @param id 主键 + * @return 站点联网数据分析 + */ + @Override + public WebSiteNetDataAnalysisVo queryById(String id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询站点联网数据分析列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 站点联网数据分析分页列表 + */ + @Override + public TableDataInfo queryPageList(WebSiteNetDataAnalysisBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的站点联网数据分析列表 + * + * @param bo 查询条件 + * @return 站点联网数据分析列表 + */ + @Override + public List queryList(WebSiteNetDataAnalysisBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WebSiteNetDataAnalysisBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getStation()), WebSiteNetDataAnalysis::getStation, bo.getStation()); + lqw.eq(StringUtils.isNotBlank(bo.getArea()), WebSiteNetDataAnalysis::getArea, bo.getArea()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), WebSiteNetDataAnalysis::getStatus, bo.getStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getIoCompany()), WebSiteNetDataAnalysis::getIoCompany, bo.getIoCompany()); + lqw.eq(StringUtils.isNotBlank(bo.getMonitorCompany()), WebSiteNetDataAnalysis::getMonitorCompany, bo.getMonitorCompany()); + lqw.eq(bo.getPlanIncome() != null, WebSiteNetDataAnalysis::getPlanIncome, bo.getPlanIncome()); + lqw.eq(bo.getActualIncome() != null, WebSiteNetDataAnalysis::getActualIncome, bo.getActualIncome()); + lqw.eq(bo.getLastTime() != null, WebSiteNetDataAnalysis::getLastTime, bo.getLastTime()); + return lqw; + } + + /** + * 新增站点联网数据分析 + * + * @param bo 站点联网数据分析 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(WebSiteNetDataAnalysisBo bo) { + WebSiteNetDataAnalysis add = MapstructUtils.convert(bo, WebSiteNetDataAnalysis.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改站点联网数据分析 + * + * @param bo 站点联网数据分析 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(WebSiteNetDataAnalysisBo bo) { + WebSiteNetDataAnalysis update = MapstructUtils.convert(bo, WebSiteNetDataAnalysis.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WebSiteNetDataAnalysis entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除站点联网数据分析信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +}