From b79b0bd801713ca690d8df850a9b63884a3c287f Mon Sep 17 00:00:00 2001 From: gjh <1421wake> Date: Fri, 21 Feb 2025 16:50:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E6=97=A5=E6=8A=A5=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DailyInspectionReportController.java | 105 +++++++++++++ .../domain/DailyInspectionReport.java | 99 +++++++++++++ .../domain/bo/DailyInspectionReportBo.java | 104 +++++++++++++ .../domain/vo/DailyInspectionReportVo.java | 112 ++++++++++++++ .../mapper/DailyInspectionReportMapper.java | 15 ++ .../IDailyInspectionReportService.java | 68 +++++++++ .../DailyInspectionReportServiceImpl.java | 140 ++++++++++++++++++ 7 files changed, 643 insertions(+) create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/DailyInspectionReportController.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/DailyInspectionReport.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/DailyInspectionReportBo.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/DailyInspectionReportVo.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/DailyInspectionReportMapper.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IDailyInspectionReportService.java create mode 100644 ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/DailyInspectionReportServiceImpl.java diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/DailyInspectionReportController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/DailyInspectionReportController.java new file mode 100644 index 0000000..b28bd69 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/DailyInspectionReportController.java @@ -0,0 +1,105 @@ +package org.dromara.platform.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.platform.domain.vo.DailyInspectionReportVo; +import org.dromara.platform.domain.bo.DailyInspectionReportBo; +import org.dromara.platform.service.IDailyInspectionReportService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 巡检日报 + * + * @author gejunhao + * @date 2025-02-21 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/platform/inspectionDailyReport") +public class DailyInspectionReportController extends BaseController { + + private final IDailyInspectionReportService dailyInspectionReportService; + + /** + * 查询巡检日报列表 + */ + @SaCheckPermission("platform:inspectionDailyReport:list") + @GetMapping("/list") + public TableDataInfo list(DailyInspectionReportBo bo, PageQuery pageQuery) { + return dailyInspectionReportService.queryPageList(bo, pageQuery); + } + + /** + * 导出巡检日报列表 + */ + @SaCheckPermission("platform:inspectionDailyReport:export") + @Log(title = "巡检日报", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DailyInspectionReportBo bo, HttpServletResponse response) { + List list = dailyInspectionReportService.queryList(bo); + ExcelUtil.exportExcel(list, "巡检日报", DailyInspectionReportVo.class, response); + } + + /** + * 获取巡检日报详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("platform:inspectionDailyReport:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(dailyInspectionReportService.queryById(id)); + } + + /** + * 新增巡检日报 + */ + @SaCheckPermission("platform:inspectionDailyReport:add") + @Log(title = "巡检日报", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DailyInspectionReportBo bo) { + return toAjax(dailyInspectionReportService.insertByBo(bo)); + } + + /** + * 修改巡检日报 + */ + @SaCheckPermission("platform:inspectionDailyReport:edit") + @Log(title = "巡检日报", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DailyInspectionReportBo bo) { + return toAjax(dailyInspectionReportService.updateByBo(bo)); + } + + /** + * 删除巡检日报 + * + * @param ids 主键串 + */ + @SaCheckPermission("platform:inspectionDailyReport:remove") + @Log(title = "巡检日报", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(dailyInspectionReportService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/DailyInspectionReport.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/DailyInspectionReport.java new file mode 100644 index 0000000..5ca8fce --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/DailyInspectionReport.java @@ -0,0 +1,99 @@ +package org.dromara.platform.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 java.io.Serial; + +/** + * 巡检日报对象 daily_inspection_report + * + * @author gejunhao + * @date 2025-02-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("daily_inspection_report") +public class DailyInspectionReport extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 记录唯一标识符 + */ + @TableId(value = "id") + private Long id; + + /** + * 项目名称 + */ + private String projectName; + + /** + * 巡检单位 + */ + private String inspectionUnit; + + /** + * 类型 + */ + private Long type; + + /** + * 巡检时间 + */ + private Date inspectionTime; + + /** + * 巡检人员 + */ + private String inspectionPeople; + + /** + * 巡检部位 + */ + private String inspectionPart; + + /** + * 附件 + */ + private String attachment; + + /** + * 运维单位 + */ + private String ioCompany; + + /** + * 巡检情况 + */ + private Long inspectionStatus; + + /** + * 平台在线率 + */ + private Long platformOnlineRate; + + /** + * 问题处理描述 + */ + private String problemHandleDesc; + + /** + * 巡检照片 + */ + private String inspectionPhoto; + + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/DailyInspectionReportBo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/DailyInspectionReportBo.java new file mode 100644 index 0000000..2f66558 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/DailyInspectionReportBo.java @@ -0,0 +1,104 @@ +package org.dromara.platform.domain.bo; + +import org.dromara.platform.domain.DailyInspectionReport; +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; + +/** + * 巡检日报业务对象 daily_inspection_report + * + * @author gejunhao + * @date 2025-02-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DailyInspectionReport.class, reverseConvertGenerate = false) +public class DailyInspectionReportBo extends BaseEntity { + + /** + * 记录唯一标识符 + */ + @NotNull(message = "记录唯一标识符不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 项目名称 + */ + @NotBlank(message = "项目名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String projectName; + + /** + * 巡检单位 + */ + @NotBlank(message = "巡检单位不能为空", groups = { AddGroup.class, EditGroup.class }) + private String inspectionUnit; + + /** + * 类型 + */ + @NotNull(message = "类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long type; + + /** + * 巡检时间 + */ + @NotNull(message = "巡检时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date inspectionTime; + + /** + * 巡检人员 + */ + @NotBlank(message = "巡检人员不能为空", groups = { AddGroup.class, EditGroup.class }) + private String inspectionPeople; + + /** + * 巡检部位 + */ + @NotBlank(message = "巡检部位不能为空", groups = { AddGroup.class, EditGroup.class }) + private String inspectionPart; + + /** + * 附件 + */ + @NotBlank(message = "附件不能为空", groups = { AddGroup.class, EditGroup.class }) + private String attachment; + + /** + * 运维单位 + */ + @NotBlank(message = "运维单位不能为空", groups = { AddGroup.class, EditGroup.class }) + private String ioCompany; + + /** + * 巡检情况 + */ + @NotNull(message = "巡检情况不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long inspectionStatus; + + /** + * 平台在线率 + */ + @NotNull(message = "平台在线率不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long platformOnlineRate; + + /** + * 问题处理描述 + */ + @NotBlank(message = "问题处理描述不能为空", groups = { AddGroup.class, EditGroup.class }) + private String problemHandleDesc; + + /** + * 巡检照片 + */ + @NotBlank(message = "巡检照片不能为空", groups = { AddGroup.class, EditGroup.class }) + private String inspectionPhoto; + + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/DailyInspectionReportVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/DailyInspectionReportVo.java new file mode 100644 index 0000000..8507aa8 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/DailyInspectionReportVo.java @@ -0,0 +1,112 @@ +package org.dromara.platform.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.platform.domain.DailyInspectionReport; +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 java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 巡检日报视图对象 daily_inspection_report + * + * @author gejunhao + * @date 2025-02-21 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DailyInspectionReport.class) +public class DailyInspectionReportVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 记录唯一标识符 + */ + @ExcelProperty(value = "记录唯一标识符") + private Long id; + + /** + * 项目名称 + */ + @ExcelProperty(value = "项目名称") + private String projectName; + + /** + * 巡检单位 + */ + @ExcelProperty(value = "巡检单位") + private String inspectionUnit; + + /** + * 类型 + */ + @ExcelProperty(value = "类型") + private Long type; + + /** + * 巡检时间 + */ + @ExcelProperty(value = "巡检时间") + private Date inspectionTime; + + /** + * 巡检人员 + */ + @ExcelProperty(value = "巡检人员") + private String inspectionPeople; + + /** + * 巡检部位 + */ + @ExcelProperty(value = "巡检部位") + private String inspectionPart; + + /** + * 附件 + */ + @ExcelProperty(value = "附件") + private String attachment; + + /** + * 运维单位 + */ + @ExcelProperty(value = "运维单位") + private String ioCompany; + + /** + * 巡检情况 + */ + @ExcelProperty(value = "巡检情况") + private Long inspectionStatus; + + /** + * 平台在线率 + */ + @ExcelProperty(value = "平台在线率") + private Long platformOnlineRate; + + /** + * 问题处理描述 + */ + @ExcelProperty(value = "问题处理描述") + private String problemHandleDesc; + + /** + * 巡检照片 + */ + @ExcelProperty(value = "巡检照片") + private String inspectionPhoto; + + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/DailyInspectionReportMapper.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/DailyInspectionReportMapper.java new file mode 100644 index 0000000..be0998e --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/DailyInspectionReportMapper.java @@ -0,0 +1,15 @@ +package org.dromara.platform.mapper; + +import org.dromara.platform.domain.DailyInspectionReport; +import org.dromara.platform.domain.vo.DailyInspectionReportVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 巡检日报Mapper接口 + * + * @author gejunhao + * @date 2025-02-21 + */ +public interface DailyInspectionReportMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IDailyInspectionReportService.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IDailyInspectionReportService.java new file mode 100644 index 0000000..8ab96c3 --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IDailyInspectionReportService.java @@ -0,0 +1,68 @@ +package org.dromara.platform.service; + +import org.dromara.platform.domain.vo.DailyInspectionReportVo; +import org.dromara.platform.domain.bo.DailyInspectionReportBo; +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-02-21 + */ +public interface IDailyInspectionReportService { + + /** + * 查询巡检日报 + * + * @param id 主键 + * @return 巡检日报 + */ + DailyInspectionReportVo queryById(Long id); + + /** + * 分页查询巡检日报列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 巡检日报分页列表 + */ + TableDataInfo queryPageList(DailyInspectionReportBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的巡检日报列表 + * + * @param bo 查询条件 + * @return 巡检日报列表 + */ + List queryList(DailyInspectionReportBo bo); + + /** + * 新增巡检日报 + * + * @param bo 巡检日报 + * @return 是否新增成功 + */ + Boolean insertByBo(DailyInspectionReportBo bo); + + /** + * 修改巡检日报 + * + * @param bo 巡检日报 + * @return 是否修改成功 + */ + Boolean updateByBo(DailyInspectionReportBo bo); + + /** + * 校验并批量删除巡检日报信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/DailyInspectionReportServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/DailyInspectionReportServiceImpl.java new file mode 100644 index 0000000..f97f1ef --- /dev/null +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/DailyInspectionReportServiceImpl.java @@ -0,0 +1,140 @@ +package org.dromara.platform.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.platform.domain.bo.DailyInspectionReportBo; +import org.dromara.platform.domain.vo.DailyInspectionReportVo; +import org.dromara.platform.domain.DailyInspectionReport; +import org.dromara.platform.mapper.DailyInspectionReportMapper; +import org.dromara.platform.service.IDailyInspectionReportService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 巡检日报Service业务层处理 + * + * @author gejunhao + * @date 2025-02-21 + */ +@RequiredArgsConstructor +@Service +public class DailyInspectionReportServiceImpl implements IDailyInspectionReportService { + + private final DailyInspectionReportMapper baseMapper; + + /** + * 查询巡检日报 + * + * @param id 主键 + * @return 巡检日报 + */ + @Override + public DailyInspectionReportVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询巡检日报列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 巡检日报分页列表 + */ + @Override + public TableDataInfo queryPageList(DailyInspectionReportBo 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(DailyInspectionReportBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(DailyInspectionReportBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getProjectName()), DailyInspectionReport::getProjectName, bo.getProjectName()); + lqw.eq(StringUtils.isNotBlank(bo.getInspectionUnit()), DailyInspectionReport::getInspectionUnit, bo.getInspectionUnit()); + lqw.eq(bo.getType() != null, DailyInspectionReport::getType, bo.getType()); + lqw.eq(bo.getInspectionTime() != null, DailyInspectionReport::getInspectionTime, bo.getInspectionTime()); + lqw.eq(StringUtils.isNotBlank(bo.getInspectionPeople()), DailyInspectionReport::getInspectionPeople, bo.getInspectionPeople()); + lqw.eq(StringUtils.isNotBlank(bo.getInspectionPart()), DailyInspectionReport::getInspectionPart, bo.getInspectionPart()); + lqw.eq(StringUtils.isNotBlank(bo.getAttachment()), DailyInspectionReport::getAttachment, bo.getAttachment()); + lqw.eq(StringUtils.isNotBlank(bo.getIoCompany()), DailyInspectionReport::getIoCompany, bo.getIoCompany()); + lqw.eq(bo.getInspectionStatus() != null, DailyInspectionReport::getInspectionStatus, bo.getInspectionStatus()); + lqw.eq(bo.getPlatformOnlineRate() != null, DailyInspectionReport::getPlatformOnlineRate, bo.getPlatformOnlineRate()); + lqw.eq(StringUtils.isNotBlank(bo.getProblemHandleDesc()), DailyInspectionReport::getProblemHandleDesc, bo.getProblemHandleDesc()); + lqw.eq(StringUtils.isNotBlank(bo.getInspectionPhoto()), DailyInspectionReport::getInspectionPhoto, bo.getInspectionPhoto()); + return lqw; + } + + /** + * 新增巡检日报 + * + * @param bo 巡检日报 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DailyInspectionReportBo bo) { + DailyInspectionReport add = MapstructUtils.convert(bo, DailyInspectionReport.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改巡检日报 + * + * @param bo 巡检日报 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DailyInspectionReportBo bo) { + DailyInspectionReport update = MapstructUtils.convert(bo, DailyInspectionReport.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DailyInspectionReport entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除巡检日报信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +}