lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

隐患

Browse Source
This commit is contained in:
zt
2025-12-03 17:01:37 +08:00
parent 85c7ded162
commit b171ec6af0
21 changed files with 923 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesVolumeCatalogController.java
View File

@ -26,6 +26,7 @@ import org.dromara.design.domain.dto.volumecatalog.DesVolumeCatalogCreateReq;
import org.dromara.design.domain.dto.volumecatalog.DesVolumeCatalogQueryReq;
import org.dromara.design.domain.dto.volumecatalog.DesVolumeCatalogUpdateReq;
import org.dromara.design.domain.vo.CopyUserVo;
import org.dromara.design.domain.vo.DelayContVo;
import org.dromara.design.domain.vo.DesUserVo;
import org.dromara.design.domain.vo.volumecatalog.DesVolumeCatalogVo;
import org.dromara.design.domain.vo.volumefile.DesVolumeFileVo;
@ -45,10 +46,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
/**
@ -131,6 +129,16 @@ public class DesVolumeCatalogController extends BaseController {
return toAjax(desVolumeCatalogService.viewerFile(id));
}
/**
* 计划过期统计
*/
@GetMapping("/delayCont/{projectId}")
public R<DelayContVo> delayCont(@PathVariable Long projectId) {
return R.ok(desVolumeCatalogService.delayCont(projectId));
}
/**
* 新增卷册目录
*/
@ -167,6 +175,9 @@ public class DesVolumeCatalogController extends BaseController {
}
/**
* 收资清单模板导出
*/

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/dto/volumecatalog/DesVolumeCatalogQueryReq.java
View File

@ -46,4 +46,9 @@ public class DesVolumeCatalogQueryReq implements Serializable {
*/
private String designSubitem;
/**
* 0-不延期，1-延期
*/
private String delay;
}

23
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/DelayContVo.java Normal file
View File

@ -0,0 +1,23 @@
package org.dromara.design.domain.vo;
import lombok.Data;
@Data
public class DelayContVo {
/**
* 总数
*/
private Integer total;
/**
* 延迟数
*/
private Integer delay;
/**
* 今日数
*/
private Integer today;
}

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IDesVolumeCatalogService.java
View File

@ -11,7 +11,9 @@ import org.dromara.design.domain.DesVolumeFile;
import org.dromara.design.domain.dto.volumecatalog.DesVolumeCatalogCreateReq;
import org.dromara.design.domain.dto.volumecatalog.DesVolumeCatalogQueryReq;
import org.dromara.design.domain.dto.volumecatalog.DesVolumeCatalogUpdateReq;
import org.dromara.design.domain.vo.DelayContVo;
import org.dromara.design.domain.vo.volumecatalog.DesVolumeCatalogVo;
import org.springframework.web.bind.annotation.PathVariable;
import java.util.Collection;
import java.util.List;
@ -130,4 +132,9 @@ public interface IDesVolumeCatalogService extends IService<DesVolumeCatalog> {
* @return 设计子项列表
*/
List<String> listDesignSubitem(Long projectId);
/**
* 统计
*/
DelayContVo delayCont(Long projectId);
}

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IDesVolumeFileService.java
View File

@ -100,4 +100,7 @@ public interface IDesVolumeFileService extends IService<DesVolumeFile> {
TableDataInfo<DesVolumeFileAppVo> queryAppPageList(DesVolumeFileAppPageDto dto, PageQuery pageQuery);
AuditFileVo auditFile(AuditFileDto dto);
}

25
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeCatalogServiceImpl.java
View File

@ -28,6 +28,7 @@ import org.dromara.design.domain.bo.DesUserBo;
import org.dromara.design.domain.dto.volumecatalog.DesVolumeCatalogCreateReq;
import org.dromara.design.domain.dto.volumecatalog.DesVolumeCatalogQueryReq;
import org.dromara.design.domain.dto.volumecatalog.DesVolumeCatalogUpdateReq;
import org.dromara.design.domain.vo.DelayContVo;
import org.dromara.design.domain.vo.volumecatalog.DesVolumeCatalogVo;
import org.dromara.design.mapper.DesVolumeCatalogMapper;
import org.dromara.design.service.*;
@ -43,6 +44,8 @@ import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@ -236,6 +239,17 @@ public class DesVolumeCatalogServiceImpl extends ServiceImpl<DesVolumeCatalogMap
return list.stream().map(DesVolumeCatalog::getDesignSubitem).toList();
}
@Override
public DelayContVo delayCont(Long projectId) {
List<DesVolumeCatalog> list = this.lambdaQuery()
.eq(DesVolumeCatalog::getProjectId, projectId).list();
DelayContVo delayContVo = new DelayContVo();
delayContVo.setTotal(list.size());
delayContVo.setDelay((int)list.stream().filter(item -> item.getPlannedCompletion().isBefore(LocalDate.now()) && item.getDesignState().equals("2")).count());
delayContVo.setToday((int)list.stream().filter(item -> item.getPlannedCompletion().isEqual(LocalDate.now())).count());
return delayContVo;
}
/**
* 修改卷册目录
*
@ -353,6 +367,7 @@ public class DesVolumeCatalogServiceImpl extends ServiceImpl<DesVolumeCatalogMap
String auditStatus = req.getAuditStatus();
String isUpload = req.getIsUpload();
String designSubitem = req.getDesignSubitem();
String delay = req.getDelay();
// lqw.orderByDesc(DesVolumeCatalog::getCreateTime);
lqw.orderByAsc(DesVolumeCatalog::getSerialNumber);
lqw.like(StringUtils.isNotBlank(documentName), DesVolumeCatalog::getDocumentName, documentName);
@ -363,6 +378,16 @@ public class DesVolumeCatalogServiceImpl extends ServiceImpl<DesVolumeCatalogMap
lqw.exists("1".equals(isUpload), "SELECT 1 FROM des_volume_file WHERE volume_catalog_id = des_volume_catalog.design");
lqw.notExists("0".equals(isUpload), "SELECT 1 FROM des_volume_file WHERE volume_catalog_id = des_volume_catalog.design");
if("1".equals(delay)){
lqw.lt(DesVolumeCatalog::getPlannedCompletion, LocalDateTime.now());
lqw.eq(DesVolumeCatalog::getDesignState, "2");
}
if("0".equals(delay)){
lqw.and(wrapper -> wrapper.gt(DesVolumeCatalog::getPlannedCompletion, LocalDateTime.now())
.or()
.eq(DesVolumeCatalog::getDesignState, "1")
);
}
return lqw;
}

10
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/QltQualityConstructionLog.java
View File

@ -34,6 +34,11 @@ public class QltQualityConstructionLog extends BaseEntity {
*/
private Long projectId;
/**
* 类型 1-文字，2-文件
*/
private String type;
/**
* 标题
*/
@ -44,6 +49,11 @@ public class QltQualityConstructionLog extends BaseEntity {
*/
private LocalDate happenDate;
/**
* 结束日期
*/
private LocalDate endDate;
/**
* 生产情况
*/

10
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityconstructionlog/QltQualityConstructionLogCreateReq.java
View File

@ -21,11 +21,21 @@ public class QltQualityConstructionLogCreateReq implements Serializable {
*/
private Long projectId;
/**
* 类型 1-文字，2-文件
*/
private String type;
/**
* 发生日期
*/
private LocalDate happenDate;
/**
* 结束日期
*/
private LocalDate endDate;
/**
* 生产情况
*/

11
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/qualityconstructionlog/QltQualityConstructionLogVo.java
View File

@ -40,6 +40,11 @@ public class QltQualityConstructionLogVo implements Serializable {
*/
private Long projectId;
/**
* 类型 1-文字，2-文件
*/
private String type;
/**
* 项目名称
*/
@ -52,6 +57,12 @@ public class QltQualityConstructionLogVo implements Serializable {
@ExcelProperty(value = "发生日期")
private LocalDate happenDate;
/**
* 结束日期
*/
private LocalDate endDate;
/**
* 生产情况
*/

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityConstructionLogServiceImpl.java
View File

@ -224,6 +224,8 @@ public class QltQualityConstructionLogServiceImpl extends ServiceImpl<QltQuality
Long projectId = req.getProjectId();
LocalDate happenDate = req.getHappenDate();
// 精准查询
lqw.orderByDesc(QltQualityConstructionLog::getHappenDate);
lqw.orderByDesc(QltQualityConstructionLog::getId);
lqw.eq(ObjectUtils.isNotEmpty(projectId), QltQualityConstructionLog::getProjectId, projectId);
lqw.eq(ObjectUtils.isNotEmpty(happenDate), QltQualityConstructionLog::getHappenDate, happenDate);
lqw.like(StringUtils.isNotBlank(req.getTitle()), QltQualityConstructionLog::getTitle, req.getTitle());

105
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HazardHiddenDangerController.java Normal file
View File

@ -0,0 +1,105 @@
package org.dromara.safety.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.safety.domain.vo.HazardHiddenDangerVo;
import org.dromara.safety.domain.bo.HazardHiddenDangerBo;
import org.dromara.safety.service.IHazardHiddenDangerService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 隐患信息
*
* @author Lion Li
* @date 2025-12-03
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/safety/hiddenDanger")
public class HazardHiddenDangerController extends BaseController {
private final IHazardHiddenDangerService hazardHiddenDangerService;
/**
* 查询隐患信息列表
*/
@SaCheckPermission("safety:hiddenDanger:list")
@GetMapping("/list")
public TableDataInfo<HazardHiddenDangerVo> list(HazardHiddenDangerBo bo, PageQuery pageQuery) {
return hazardHiddenDangerService.queryPageList(bo, pageQuery);
}
/**
* 导出隐患信息列表
*/
@SaCheckPermission("safety:hiddenDanger:export")
@Log(title = "隐患信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HazardHiddenDangerBo bo, HttpServletResponse response) {
List<HazardHiddenDangerVo> list = hazardHiddenDangerService.queryList(bo);
ExcelUtil.exportExcel(list, "隐患信息", HazardHiddenDangerVo.class, response);
}
/**
* 获取隐患信息详细信息
*
* @param id 主键
*/
@SaCheckPermission("safety:hiddenDanger:query")
@GetMapping("/{id}")
public R<HazardHiddenDangerVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(hazardHiddenDangerService.queryById(id));
}
/**
* 新增隐患信息
*/
@SaCheckPermission("safety:hiddenDanger:add")
@Log(title = "隐患信息", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody HazardHiddenDangerBo bo) {
return toAjax(hazardHiddenDangerService.insertByBo(bo));
}
/**
* 修改隐患信息
*/
@SaCheckPermission("safety:hiddenDanger:edit")
@Log(title = "隐患信息", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody HazardHiddenDangerBo bo) {
return toAjax(hazardHiddenDangerService.updateByBo(bo));
}
/**
* 删除隐患信息
*
* @param ids 主键串
*/
@SaCheckPermission("safety:hiddenDanger:remove")
@Log(title = "隐患信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(hazardHiddenDangerService.deleteWithValidByIds(List.of(ids), true));
}
}

138
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HazardHiddenDanger.java Normal file
View File

@ -0,0 +1,138 @@
package org.dromara.safety.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
import java.time.LocalDateTime;
/**
* 隐患信息对象 hazard_hidden_danger
*
* @author Lion Li
* @date 2025-12-03
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("hazard_hidden_danger")
public class HazardHiddenDanger extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 角色ID
*/
@TableId(value = "id")
private Long id;
/**
* 隐患编号
*/
private String dangerCode;
/**
* 隐患名称
*/
private String dangerName;
/**
* 隐患类型
*/
private String dangerType;
/**
* 隐患描述
*/
private String dangerDes;
/**
* 隐患附件
*/
private String dangerFile;
/**
* 上报位置
*/
private String reportLocation;
/**
* 上报人
*/
private Long reporter;
/**
* 上报人电话
*/
private String reportPhone;
/**
* 上报时间
*/
private LocalDateTime reportTime;
/**
* 隐患等级ID
*/
private Long dangerLevelId;
/**
* 评估人
*/
private Long evaluator;
/**
* 评估时间
*/
private LocalDateTime evaluateTime;
/**
* 评估依据
*/
private String evaluateBasis;
/**
* 评估意见
*/
private String reporterOpinion;
/**
* 评估附件
*/
private String reporterFile;
/**
* 整改时间
*/
private LocalDateTime rectifyTime;
/**
* 整改单位 1-班组 2-分包
*/
private String rectifyUnit;
/**
* 整改单位ID
*/
private Long rectifyUnitId;
/**
* 整改负责人Id
*/
private Long rectifyUserId;
/**
* 状态（1-待评估，2-待整改，3-待复查，4-已闭环）
*/
private String status;
/**
* 备注
*/
private String remark;
}

10
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyLog.java
View File

@ -33,11 +33,21 @@ public class HseSafetyLog extends BaseEntity {
*/
private Long projectId;
/**
* 类型 1-文字，2-文件
*/
private String type;
/**
* 发生日期
*/
private String dateOfOccurrence;
/**
* 结束日期
*/
private String endDate;
/**
* 最高气温
*/

138
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/bo/HazardHiddenDangerBo.java Normal file
View File

@ -0,0 +1,138 @@
package org.dromara.safety.domain.bo;
import org.dromara.safety.domain.HazardHiddenDanger;
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.time.LocalDateTime;
/**
* 隐患信息业务对象 hazard_hidden_danger
*
* @author Lion Li
* @date 2025-12-03
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = HazardHiddenDanger.class, reverseConvertGenerate = false)
public class HazardHiddenDangerBo extends BaseEntity {
/**
* ID
*/
@NotNull(message = "ID不能为空", groups = { EditGroup.class })
private Long id;
/**
* 隐患编号
*/
private String dangerCode;
/**
* 隐患类型
*/
private String dangerType;
/**
* 隐患名称
*/
private String dangerName;
/**
* 隐患描述
*/
private String dangerDes;
/**
* 隐患附件
*/
private String dangerFile;
/**
* 上报位置
*/
private String reportLocation;
/**
* 上报人
*/
private Long reporter;
/**
* 上报人电话
*/
private String reportPhone;
/**
* 上报时间
*/
private LocalDateTime reportTime;
/**
* 隐患等级ID
*/
private Long dangerLevelId;
/**
* 评估人
*/
private Long evaluator;
/**
* 评估时间
*/
private LocalDateTime evaluateTime;
/**
* 评估依据
*/
private String evaluateBasis;
/**
* 评估意见
*/
private String reporterOpinion;
/**
* 评估附件
*/
private String reporterFile;
/**
* 整改时间
*/
private LocalDateTime rectifyTime;
/**
* 整改单位 1-班组 2-分包
*/
private String rectifyUnit;
/**
* 整改单位ID
*/
private Long rectifyUnitId;
/**
* 整改负责人Id
*/
private Long rectifyUserId;
/**
* 状态（1-待评估，2-待整改，3-待复查，4-已闭环）
*/
@NotBlank(message = "状态（1-待评估，2-待整改，3-待复查，4-已闭环）不能为空", groups = { AddGroup.class, EditGroup.class })
private String status;
/**
* 备注
*/
private String remark;
}

10
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetylog/HseSafetyLogCreateReq.java
View File

@ -23,12 +23,22 @@ public class HseSafetyLogCreateReq implements Serializable {
@NotNull(message = "项目id不能为空")
private Long projectId;
/**
* 类型 1-文字，2-文件
*/
private String type;
/**
* 发生日期
*/
@NotBlank(message = "发生日期不能为空")
private String dateOfOccurrence;
/**
* 结束日期
*/
private String endDate;
/**
* 最高气温
*/

162
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/HazardHiddenDangerVo.java Normal file
View File

@ -0,0 +1,162 @@
package org.dromara.safety.domain.vo;
import org.dromara.safety.domain.HazardHiddenDanger;
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.time.LocalDateTime;
import java.util.Date;
/**
* 隐患信息视图对象 hazard_hidden_danger
*
* @author Lion Li
* @date 2025-12-03
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = HazardHiddenDanger.class)
public class HazardHiddenDangerVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 角色ID
*/
@ExcelProperty(value = "角色ID")
private Long id;
/**
* 隐患编号
*/
@ExcelProperty(value = "隐患编号")
private String dangerCode;
/**
* 隐患名称
*/
@ExcelProperty(value = "隐患名称")
private String dangerName;
/**
* 上报位置
*/
@ExcelProperty(value = "上报位置")
private String reportLocation;
/**
* 上报人
*/
@ExcelProperty(value = "上报人")
private Long reporter;
/**
* 上报人电话
*/
private String reportPhone;
/**
* 上报时间
*/
@ExcelProperty(value = "上报时间")
private LocalDateTime reportTime;
/**
* 隐患等级ID
*/
@ExcelProperty(value = "隐患等级ID")
private Long dangerLevelId;
/**
* 隐患类型
*/
private String dangerType;
/**
* 隐患描述
*/
private String dangerDes;
/**
* 隐患附件
*/
private String dangerFile;
/**
* 评估人
*/
@ExcelProperty(value = "评估人")
private Long evaluator;
/**
* 评估时间
*/
@ExcelProperty(value = "评估时间")
private LocalDateTime evaluateTime;
/**
* 评估依据
*/
@ExcelProperty(value = "评估依据")
private String evaluateBasis;
/**
* 评估意见
*/
@ExcelProperty(value = "评估意见")
private String reporterOpinion;
/**
* 评估附件
*/
@ExcelProperty(value = "评估附件")
private String reporterFile;
/**
* 整改时间
*/
@ExcelProperty(value = "整改时间")
private LocalDateTime rectifyTime;
/**
* 整改单位 1-班组 2-分包
*/
@ExcelProperty(value = "整改单位 1-班组 2-分包")
private String rectifyUnit;
/**
* 整改单位ID
*/
@ExcelProperty(value = "整改单位ID")
private Long rectifyUnitId;
/**
* 整改负责人Id
*/
@ExcelProperty(value = "整改负责人Id")
private Long rectifyUserId;
/**
* 状态（1-待评估，2-待整改，3-待复查，4-已闭环）
*/
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "1=-待评估，2-待整改，3-待复查，4-已闭环")
private String status;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

12
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetylog/HseSafetyLogVo.java
View File

@ -41,12 +41,24 @@ public class HseSafetyLogVo implements Serializable {
@ExcelProperty(value = "项目id")
private Long projectId;
/**
* 类型 1-文字，2-文件
*/
private String type;
/**
* 发生日期
*/
@ExcelProperty(value = "发生日期")
private String dateOfOccurrence;
/**
* 结束日期
*/
private String endDate;
/**
* 最高气温
*/

15
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HazardHiddenDangerMapper.java Normal file
View File

@ -0,0 +1,15 @@
package org.dromara.safety.mapper;
import org.dromara.safety.domain.HazardHiddenDanger;
import org.dromara.safety.domain.vo.HazardHiddenDangerVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 隐患信息Mapper接口
*
* @author Lion Li
* @date 2025-12-03
*/
public interface HazardHiddenDangerMapper extends BaseMapperPlus<HazardHiddenDanger, HazardHiddenDangerVo> {
}

70
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHazardHiddenDangerService.java Normal file
View File

@ -0,0 +1,70 @@
package org.dromara.safety.service;
import org.dromara.safety.domain.vo.HazardHiddenDangerVo;
import org.dromara.safety.domain.bo.HazardHiddenDangerBo;
import org.dromara.safety.domain.HazardHiddenDanger;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.Collection;
import java.util.List;
/**
* 隐患信息Service接口
*
* @author Lion Li
* @date 2025-12-03
*/
public interface IHazardHiddenDangerService extends IService<HazardHiddenDanger>{
/**
* 查询隐患信息
*
* @param id 主键
* @return 隐患信息
*/
HazardHiddenDangerVo queryById(Long id);
/**
* 分页查询隐患信息列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 隐患信息分页列表
*/
TableDataInfo<HazardHiddenDangerVo> queryPageList(HazardHiddenDangerBo bo, PageQuery pageQuery);
/**
* 查询符合条件的隐患信息列表
*
* @param bo 查询条件
* @return 隐患信息列表
*/
List<HazardHiddenDangerVo> queryList(HazardHiddenDangerBo bo);
/**
* 新增隐患信息
*
* @param bo 隐患信息
* @return 是否新增成功
*/
Boolean insertByBo(HazardHiddenDangerBo bo);
/**
* 修改隐患信息
*
* @param bo 隐患信息
* @return 是否修改成功
*/
Boolean updateByBo(HazardHiddenDangerBo bo);
/**
* 校验并批量删除隐患信息信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

145
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HazardHiddenDangerServiceImpl.java Normal file
View File

@ -0,0 +1,145 @@
package org.dromara.safety.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.safety.domain.bo.HazardHiddenDangerBo;
import org.dromara.safety.domain.vo.HazardHiddenDangerVo;
import org.dromara.safety.domain.HazardHiddenDanger;
import org.dromara.safety.mapper.HazardHiddenDangerMapper;
import org.dromara.safety.service.IHazardHiddenDangerService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 隐患信息Service业务层处理
*
* @author Lion Li
* @date 2025-12-03
*/
@RequiredArgsConstructor
@Service
public class HazardHiddenDangerServiceImpl extends ServiceImpl<HazardHiddenDangerMapper, HazardHiddenDanger> implements IHazardHiddenDangerService {
private final HazardHiddenDangerMapper baseMapper;
/**
* 查询隐患信息
*
* @param id 主键
* @return 隐患信息
*/
@Override
public HazardHiddenDangerVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询隐患信息列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 隐患信息分页列表
*/
@Override
public TableDataInfo<HazardHiddenDangerVo> queryPageList(HazardHiddenDangerBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<HazardHiddenDanger> lqw = buildQueryWrapper(bo);
Page<HazardHiddenDangerVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的隐患信息列表
*
* @param bo 查询条件
* @return 隐患信息列表
*/
@Override
public List<HazardHiddenDangerVo> queryList(HazardHiddenDangerBo bo) {
LambdaQueryWrapper<HazardHiddenDanger> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<HazardHiddenDanger> buildQueryWrapper(HazardHiddenDangerBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<HazardHiddenDanger> lqw = Wrappers.lambdaQuery();
lqw.orderByDesc(HazardHiddenDanger::getId);
lqw.eq(StringUtils.isNotBlank(bo.getDangerCode()), HazardHiddenDanger::getDangerCode, bo.getDangerCode());
lqw.like(StringUtils.isNotBlank(bo.getDangerName()), HazardHiddenDanger::getDangerName, bo.getDangerName());
lqw.eq(StringUtils.isNotBlank(bo.getReportLocation()), HazardHiddenDanger::getReportLocation, bo.getReportLocation());
lqw.eq(bo.getReporter() != null, HazardHiddenDanger::getReporter, bo.getReporter());
lqw.eq(bo.getReportTime() != null, HazardHiddenDanger::getReportTime, bo.getReportTime());
lqw.eq(bo.getDangerLevelId() != null, HazardHiddenDanger::getDangerLevelId, bo.getDangerLevelId());
lqw.eq(bo.getEvaluator() != null, HazardHiddenDanger::getEvaluator, bo.getEvaluator());
lqw.eq(bo.getEvaluateTime() != null, HazardHiddenDanger::getEvaluateTime, bo.getEvaluateTime());
lqw.eq(StringUtils.isNotBlank(bo.getEvaluateBasis()), HazardHiddenDanger::getEvaluateBasis, bo.getEvaluateBasis());
lqw.eq(StringUtils.isNotBlank(bo.getReporterOpinion()), HazardHiddenDanger::getReporterOpinion, bo.getReporterOpinion());
lqw.eq(StringUtils.isNotBlank(bo.getReporterFile()), HazardHiddenDanger::getReporterFile, bo.getReporterFile());
lqw.eq(bo.getRectifyTime() != null, HazardHiddenDanger::getRectifyTime, bo.getRectifyTime());
lqw.eq(StringUtils.isNotBlank(bo.getRectifyUnit()), HazardHiddenDanger::getRectifyUnit, bo.getRectifyUnit());
lqw.eq(bo.getRectifyUnitId() != null, HazardHiddenDanger::getRectifyUnitId, bo.getRectifyUnitId());
lqw.eq(bo.getRectifyUserId() != null, HazardHiddenDanger::getRectifyUserId, bo.getRectifyUserId());
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), HazardHiddenDanger::getStatus, bo.getStatus());
return lqw;
}
/**
* 新增隐患信息
*
* @param bo 隐患信息
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(HazardHiddenDangerBo bo) {
HazardHiddenDanger add = MapstructUtils.convert(bo, HazardHiddenDanger.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改隐患信息
*
* @param bo 隐患信息
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(HazardHiddenDangerBo bo) {
HazardHiddenDanger update = MapstructUtils.convert(bo, HazardHiddenDanger.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(HazardHiddenDanger entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除隐患信息信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HazardHiddenDangerMapper.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.safety.mapper.HazardHiddenDangerMapper">
</mapper>