From 1c54d0af79a533ecadff702e7dca92d9a136758d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 28 一月 2026 13:39:20 +0800
Subject: [PATCH] 安全生产--危险物料管控
---
src/main/java/com/ruoyi/safe/service/impl/SafeHazardRecordServiceImpl.java | 88 ++++++++++++
src/main/resources/mapper/safe/SafeHazardRecordMapper.xml | 54 +++++++
src/main/java/com/ruoyi/safe/dto/SafeHazardRecordDto.java | 43 ++++++
src/main/java/com/ruoyi/safe/mapper/SafeHazardRecordMapper.java | 23 +++
src/main/java/com/ruoyi/safe/service/SafeHazardRecordService.java | 28 ++++
src/main/java/com/ruoyi/safe/controller/SafeHazardController.java | 2
src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java | 88 ++++++++++++
src/main/java/com/ruoyi/safe/controller/SafeHazardRecordController.java | 57 ++++++++
8 files changed, 383 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java b/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java
index 6e999d1..172d491 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java
@@ -40,11 +40,13 @@
public R add(@RequestBody SafeHazard safeHazard) {
return R.ok(safeHazardService.save(safeHazard));
}
+
@ApiOperation("淇敼鍗遍櫓婧愬彴璐�")
@PutMapping ()
public R update(@RequestBody SafeHazard safeHazard) {
return R.ok(safeHazardService.updateById(safeHazard));
}
+
@ApiOperation("鍒犻櫎鍗遍櫓婧愬彴璐�")
@DeleteMapping("/{ids}")
public R delSafeHazard(@RequestBody List<Integer> ids) {
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeHazardRecordController.java b/src/main/java/com/ruoyi/safe/controller/SafeHazardRecordController.java
new file mode 100644
index 0000000..9e4e139
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/controller/SafeHazardRecordController.java
@@ -0,0 +1,57 @@
+package com.ruoyi.safe.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.safe.dto.SafeHazardRecordDto;
+import com.ruoyi.safe.pojo.SafeHazard;
+import com.ruoyi.safe.pojo.SafeHazardRecord;
+import com.ruoyi.safe.service.SafeHazardRecordService;
+import com.ruoyi.safe.service.SafeHazardService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 瀹夊叏鐢熶骇--鍗遍櫓鐗╂枡绠℃帶 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-28 01:13:40
+ */
+@RestController
+@RequestMapping("/safeHazardRecord")
+@Api(tags = "瀹夊叏鐢熶骇--鍗遍櫓鐗╂枡绠℃帶")
+public class SafeHazardRecordController {
+
+ @Autowired
+ private SafeHazardRecordService safeHazardRecordService;
+
+ @GetMapping("/page")
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ public R page(Page page, SafeHazardRecordDto safeHazardRecordDto) {
+ return R.ok(safeHazardRecordService.pageSafeHazardRecord(page, safeHazardRecordDto));
+ }
+
+ @ApiOperation("棰嗙敤")
+ @PostMapping("/borrow")
+ public R borrow(@RequestBody SafeHazardRecord safeHazardRecord) {
+ return R.ok(safeHazardRecordService.borrow(safeHazardRecord));
+ }
+
+ @ApiOperation("褰掕繕")
+ @PutMapping("/return")
+ public R returnSafeHazardRecord(@RequestBody SafeHazardRecord safeHazardRecord) {
+ return R.ok(safeHazardRecordService.returnSafeHazardRecord(safeHazardRecord));
+ }
+
+ @ApiOperation("鍒犻櫎")
+ @DeleteMapping("/{ids}")
+ public R delSafeHazardRecord(@RequestBody List<Integer> ids) {
+ return R.ok(safeHazardRecordService.delSafeHazardRecord(ids));
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/safe/dto/SafeHazardRecordDto.java b/src/main/java/com/ruoyi/safe/dto/SafeHazardRecordDto.java
new file mode 100644
index 0000000..3d2c2e0
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/dto/SafeHazardRecordDto.java
@@ -0,0 +1,43 @@
+package com.ruoyi.safe.dto;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.safe.pojo.SafeHazardRecord;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Data
+public class SafeHazardRecordDto extends SafeHazardRecord {
+
+ @ApiModelProperty("棰嗙敤浜�")
+ private String applyUserName;
+
+ @ApiModelProperty("褰掕繕浜�")
+ private String returnUserName;
+
+ @ApiModelProperty("鍗遍櫓婧愬悕绉�")
+ private String name;
+
+ @ApiModelProperty("鍗遍櫓婧愮紪鐮�")
+ private String code;
+
+ @ApiModelProperty("鍗遍櫓婧愮被鍨�")
+ private String type;
+
+ @ApiModelProperty("椋庨櫓绛夌骇")
+ private String riskLevel;
+
+ @ApiModelProperty("鎵�鍦ㄤ綅缃�")
+ private String location;
+
+
+}
diff --git a/src/main/java/com/ruoyi/safe/mapper/SafeHazardRecordMapper.java b/src/main/java/com/ruoyi/safe/mapper/SafeHazardRecordMapper.java
new file mode 100644
index 0000000..7328be1
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/mapper/SafeHazardRecordMapper.java
@@ -0,0 +1,23 @@
+package com.ruoyi.safe.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.safe.dto.SafeHazardRecordDto;
+import com.ruoyi.safe.pojo.SafeHazardRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 瀹夊叏鐢熶骇--鍗遍櫓鐗╂枡绠℃帶 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-28 01:13:40
+ */
+@Mapper
+public interface SafeHazardRecordMapper extends BaseMapper<SafeHazardRecord> {
+
+ IPage<SafeHazardRecordDto> pageSafeHazardRecord(Page page, @Param("c") SafeHazardRecordDto safeHazardRecordDto);
+}
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java b/src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java
new file mode 100644
index 0000000..45ff844
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java
@@ -0,0 +1,88 @@
+package com.ruoyi.safe.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 瀹夊叏鐢熶骇--鍗遍櫓鐗╂枡绠℃帶
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-28 01:13:40
+ */
+@Getter
+@Setter
+@TableName("safe_hazard_record")
+@ApiModel(value = "SafeHazardRecord瀵硅薄", description = "瀹夊叏鐢熶骇--鍗遍櫓鐗╂枡绠℃帶")
+public class SafeHazardRecord implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("鍗曞彿")
+ private String materialRecordCode;
+
+ @ApiModelProperty("鍏宠仈鍗遍櫓婧愬彴璐� ID")
+ private Integer safeHazardId;
+
+ @ApiModelProperty("棰嗙敤浜� ID")
+ private Integer applyUserId;
+
+ @ApiModelProperty("棰嗙敤鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate applyTime;
+
+ @ApiModelProperty("棰嗙敤鏁伴噺")
+ private BigDecimal applyQty;
+
+ @ApiModelProperty("棰嗙敤鐢ㄩ��")
+ private String applyPurpose;
+
+ @ApiModelProperty("褰掕繕浜� ID")
+ private Integer returnUserId;
+
+ @ApiModelProperty("褰掕繕鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate returnTime;
+
+ @ApiModelProperty("褰掕繕鎯呭喌璇存槑")
+ private String returnRemark;
+
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Integer tenantId;
+}
diff --git a/src/main/java/com/ruoyi/safe/service/SafeHazardRecordService.java b/src/main/java/com/ruoyi/safe/service/SafeHazardRecordService.java
new file mode 100644
index 0000000..ab79b88
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/service/SafeHazardRecordService.java
@@ -0,0 +1,28 @@
+package com.ruoyi.safe.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.safe.dto.SafeHazardRecordDto;
+import com.ruoyi.safe.pojo.SafeHazardRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 瀹夊叏鐢熶骇--鍗遍櫓鐗╂枡绠℃帶 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-28 01:13:40
+ */
+public interface SafeHazardRecordService extends IService<SafeHazardRecord> {
+
+ IPage<SafeHazardRecordDto> pageSafeHazardRecord(Page page, SafeHazardRecordDto safeHazardRecordDto);
+
+ int borrow(SafeHazardRecord safeHazardRecord);
+
+ int returnSafeHazardRecord(SafeHazardRecord safeHazardRecord);
+
+ int delSafeHazardRecord(List<Integer> ids);
+}
diff --git a/src/main/java/com/ruoyi/safe/service/impl/SafeHazardRecordServiceImpl.java b/src/main/java/com/ruoyi/safe/service/impl/SafeHazardRecordServiceImpl.java
new file mode 100644
index 0000000..e6c6a08
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeHazardRecordServiceImpl.java
@@ -0,0 +1,88 @@
+package com.ruoyi.safe.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.safe.dto.SafeHazardRecordDto;
+import com.ruoyi.safe.mapper.SafeHazardMapper;
+import com.ruoyi.safe.pojo.SafeHazard;
+import com.ruoyi.safe.pojo.SafeHazardRecord;
+import com.ruoyi.safe.mapper.SafeHazardRecordMapper;
+import com.ruoyi.safe.service.SafeHazardRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * <p>
+ * 瀹夊叏鐢熶骇--鍗遍櫓鐗╂枡绠℃帶 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-28 01:13:40
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class SafeHazardRecordServiceImpl extends ServiceImpl<SafeHazardRecordMapper, SafeHazardRecord> implements SafeHazardRecordService {
+
+ @Autowired
+ private SafeHazardRecordMapper safeHazardRecordMapper;
+ @Autowired
+ private SafeHazardMapper safeHazardMapper;
+
+ @Override
+ public IPage<SafeHazardRecordDto> pageSafeHazardRecord(Page page, SafeHazardRecordDto safeHazardRecordDto) {
+ return safeHazardRecordMapper.pageSafeHazardRecord(page, safeHazardRecordDto);
+ }
+
+ @Override
+ public int borrow(SafeHazardRecord safeHazardRecord) {
+ //鍒ゆ柇鏁伴噺鏄惁婊¤冻
+ SafeHazard safeHazard = safeHazardMapper.selectById(safeHazardRecord.getSafeHazardId());
+ if (safeHazard.getStockQty().compareTo(safeHazardRecord.getApplyQty())<0) {
+ throw new RuntimeException("搴撳瓨鏁伴噺涓嶈冻");
+ }
+ //棰嗙敤
+ safeHazardRecord.setApplyUserId(SecurityUtils.getUserId().intValue());
+ safeHazardRecord.setApplyTime(LocalDate.now());
+ safeHazardRecordMapper.insert(safeHazardRecord);
+ //鍑忓簱瀛�
+ safeHazard.setStockQty(safeHazard.getStockQty().subtract(safeHazardRecord.getApplyQty()));
+ safeHazardMapper.updateById(safeHazard);
+ return 0;
+ }
+
+ @Override
+ public int returnSafeHazardRecord(SafeHazardRecord safeHazardRecord) {
+ SafeHazard safeHazard = safeHazardMapper.selectById(safeHazardRecord.getSafeHazardId());
+ //褰掕繕
+ safeHazardRecord.setReturnUserId(SecurityUtils.getUserId().intValue());
+ safeHazardRecord.setReturnTime(LocalDate.now());
+ safeHazardRecordMapper.updateById(safeHazardRecord);
+ //澧炲簱瀛�
+ safeHazard.setStockQty(safeHazard.getStockQty().add(safeHazardRecord.getApplyQty()));
+ safeHazardMapper.updateById(safeHazard);
+ return 0;
+ }
+
+ @Override
+ public int delSafeHazardRecord(List<Integer> ids) {
+ List<SafeHazardRecord> safeHazardRecords = safeHazardRecordMapper.selectBatchIds(ids);
+ for (SafeHazardRecord safeHazardRecord : safeHazardRecords) {
+ //鍒ゆ柇鏄惁鏈夊綊杩�
+ if (ObjectUtils.isNull(safeHazardRecord.getReturnUserId())){
+ //娌℃湁褰掕繕,鍒犻櫎棰嗙敤璁板綍闇�瑕佸鍔犲簱瀛�
+ SafeHazard safeHazard = safeHazardMapper.selectById(safeHazardRecord.getSafeHazardId());
+ safeHazard.setStockQty(safeHazard.getStockQty().add(safeHazardRecord.getApplyQty()));
+ safeHazardMapper.updateById(safeHazard);
+ }
+ }
+ safeHazardRecordMapper.deleteBatchIds(ids);
+ return 0;
+ }
+}
diff --git a/src/main/resources/mapper/safe/SafeHazardRecordMapper.xml b/src/main/resources/mapper/safe/SafeHazardRecordMapper.xml
new file mode 100644
index 0000000..cd6a85f
--- /dev/null
+++ b/src/main/resources/mapper/safe/SafeHazardRecordMapper.xml
@@ -0,0 +1,54 @@
+<?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="com.ruoyi.safe.mapper.SafeHazardRecordMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.safe.pojo.SafeHazardRecord">
+ <id column="id" property="id" />
+ <result column="material_record_code" property="materialRecordCode" />
+ <result column="safe_hazard_id" property="safeHazardId" />
+ <result column="apply_user_id" property="applyUserId" />
+ <result column="apply_time" property="applyTime" />
+ <result column="apply_qty" property="applyQty" />
+ <result column="apply_purpose" property="applyPurpose" />
+ <result column="return_user_id" property="returnUserId" />
+ <result column="return_time" property="returnTime" />
+ <result column="return_remark" property="returnRemark" />
+ <result column="create_time" property="createTime" />
+ <result column="create_user" property="createUser" />
+ <result column="update_time" property="updateTime" />
+ <result column="update_user" property="updateUser" />
+ <result column="tenant_id" property="tenantId" />
+ </resultMap>
+ <select id="pageSafeHazardRecord" resultType="com.ruoyi.safe.dto.SafeHazardRecordDto">
+ select shr.*,
+ su1.nick_name applyUserName,
+ su2.nick_name returnUserName,
+ sh.name,
+ sh.code,
+ sh.type,
+ sh.risk_level,
+ sh.location
+ from safe_hazard_record shr
+ left join sys_user su1 on shr.apply_user_id = su1.user_id
+ left join sys_user su2 on shr.return_user_id = su2.user_id
+ left join safe_hazard sh on shr.safe_hazard_id = sh.id
+ where 1=1
+ <if test="c.materialRecordCode != null and c.materialRecordCode != ''">
+ and shr.material_record_code like concat('%', #{c.materialRecordCode}, '%')
+ </if>
+ <if test="c.name != null and c.name != ''">
+ and sh.name like concat('%', #{c.name}, '%')
+ </if>
+ <if test="c.code != null and c.code != ''">
+ and sh.code like concat('%', #{c.code}, '%')
+ </if>
+ <if test="c.type != null and c.type != ''">
+ and sh.type like concat('%', #{c.type}, '%')
+ </if>
+ <if test="c.riskLevel != null and c.riskLevel != ''">
+ and sh.risk_level like concat('%', #{c.riskLevel}, '%')
+ </if>
+ </select>
+
+</mapper>
--
Gitblit v1.9.3