diff --git a/pasd-fire/src/main/java/com/ruoyi/fire/domain/FireFacility.java b/pasd-fire/src/main/java/com/ruoyi/fire/domain/FireFacility.java
index 0f81630..c02051c 100644
--- a/pasd-fire/src/main/java/com/ruoyi/fire/domain/FireFacility.java
+++ b/pasd-fire/src/main/java/com/ruoyi/fire/domain/FireFacility.java
@@ -34,7 +34,7 @@ public class FireFacility extends BaseEntity
/** 设施ID,自增主键 */
- @Excel(name = "设施ID,自增主键")
+
private Long id;
/** 位置ID(字符串描述,如"A101") */
diff --git a/pasd-fire/target/classes/mapper/fire/FireFacilityMapper.xml b/pasd-fire/target/classes/mapper/fire/FireFacilityMapper.xml
index 2668d4f..ebb259e 100644
--- a/pasd-fire/target/classes/mapper/fire/FireFacilityMapper.xml
+++ b/pasd-fire/target/classes/mapper/fire/FireFacilityMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
\ No newline at end of file
diff --git a/pasd-fire/target/classes/mapper/fire/FireFacilityRepairMapper.xml b/pasd-fire/target/classes/mapper/fire/FireFacilityRepairMapper.xml
new file mode 100644
index 0000000..4255c90
--- /dev/null
+++ b/pasd-fire/target/classes/mapper/fire/FireFacilityRepairMapper.xml
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select id, facility_id, repair_date, repair_content, repair_result, replace_person, remark, next_check_date, create_time from fire_facility_repair
+
+
+
+
+
+ and facility_id = #{facilityId}
+ and repair_date between #{params.beginRepairDate} and #{params.endRepairDate}
+ and repair_result = #{repairResult}
+ and replace_person = #{replacePerson}
+ and next_check_date between #{params.beginNextCheckDate} and #{params.endNextCheckDate}
+
+
+
+
+
+ where id = #{id}
+
+
+
+ insert into fire_facility_repair
+
+ facility_id,
+ repair_date,
+ repair_content,
+ repair_result,
+ replace_person,
+ remark,
+ next_check_date,
+ create_time,
+
+
+ #{facilityId},
+ #{repairDate},
+ #{repairContent},
+ #{repairResult},
+ #{replacePerson},
+ #{remark},
+ #{nextCheckDate},
+ #{createTime},
+
+
+
+
+ update fire_facility_repair
+
+ facility_id = #{facilityId},
+ repair_date = #{repairDate},
+ repair_content = #{repairContent},
+ repair_result = #{repairResult},
+ replace_person = #{replacePerson},
+ remark = #{remark},
+ next_check_date = #{nextCheckDate},
+ create_time = #{createTime},
+
+ where id = #{id}
+
+
+
+ delete from fire_facility_repair where id = #{id}
+
+
+
+ delete from fire_facility_repair where id in
+
+ #{id}
+
+
+
\ No newline at end of file
diff --git a/pasd-fire/target/classes/mapper/fire/FireFacilityReplacementMapper.xml b/pasd-fire/target/classes/mapper/fire/FireFacilityReplacementMapper.xml
new file mode 100644
index 0000000..61cf7ff
--- /dev/null
+++ b/pasd-fire/target/classes/mapper/fire/FireFacilityReplacementMapper.xml
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select id, old_facility_id, new_facility_id, replace_date, replace_reason, replace_person, remark, create_time from fire_facility_replacement
+
+
+
+
+
+ and old_facility_id = #{oldFacilityId}
+ and new_facility_id = #{newFacilityId}
+ and replace_date between #{params.beginReplaceDate} and #{params.endReplaceDate}
+ and replace_person = #{replacePerson}
+
+
+
+
+
+ where id = #{id}
+
+
+
+ insert into fire_facility_replacement
+
+ old_facility_id,
+ new_facility_id,
+ replace_date,
+ replace_reason,
+ replace_person,
+ remark,
+ create_time,
+
+
+ #{oldFacilityId},
+ #{newFacilityId},
+ #{replaceDate},
+ #{replaceReason},
+ #{replacePerson},
+ #{remark},
+ #{createTime},
+
+
+
+
+ update fire_facility_replacement
+
+ old_facility_id = #{oldFacilityId},
+ new_facility_id = #{newFacilityId},
+ replace_date = #{replaceDate},
+ replace_reason = #{replaceReason},
+ replace_person = #{replacePerson},
+ remark = #{remark},
+ create_time = #{createTime},
+
+ where id = #{id}
+
+
+
+ delete from fire_facility_replacement where id = #{id}
+
+
+
+ delete from fire_facility_replacement where id in
+
+ #{id}
+
+
+
\ No newline at end of file
diff --git a/pasd-fire/target/classes/mapper/fire/FireFacilityReportMapper.xml b/pasd-fire/target/classes/mapper/fire/FireFacilityReportMapper.xml
new file mode 100644
index 0000000..e5f96f7
--- /dev/null
+++ b/pasd-fire/target/classes/mapper/fire/FireFacilityReportMapper.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+ SELECT
+ id,
+ location_id AS locationId,
+ facility_name AS facilityName,
+ facility_type AS facilityType,
+ model_number AS modelNumber,
+ quantity,
+ entry_date AS entryDate,
+ production_date AS productionDate,
+ expiry_date AS expiryDate,
+ status,
+ remark,
+ create_time AS createTime,
+ update_time AS updateTime
+ FROM fire_facilities
+
+
+
+ AND facility_type = #{facilityType}
+
+
+
+
+
+ UPDATE fire_facilities
+ SET status = #{newStatus},
+ update_time = NOW()
+ WHERE id IN
+
+ #{id}
+
+
+
+
\ No newline at end of file
diff --git a/pasd-fire/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/pasd-fire/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000..367cb89
--- /dev/null
+++ b/pasd-fire/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,10 @@
+com\ruoyi\fire\controller\FireFacilityController.class
+com\ruoyi\fire\mapper\FireFacilityMapper.class
+com\ruoyi\fire\domain\FireFacility.class
+com\ruoyi\fire\service\impl\FireFacilityRepairServiceImpl.class
+com\ruoyi\fire\service\IFireFacilityRepairService.class
+com\ruoyi\fire\service\impl\FireFacilityServiceImpl.class
+com\ruoyi\fire\domain\FireFacilityRepair.class
+com\ruoyi\fire\service\IFireFacilityService.class
+com\ruoyi\fire\controller\FireFacilityRepairController.class
+com\ruoyi\fire\mapper\FireFacilityRepairMapper.class
diff --git a/pasd-fire/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/pasd-fire/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000..ea2039f
--- /dev/null
+++ b/pasd-fire/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,10 @@
+C:\DataFromJunhua\DevTools\DevCode\pasx\pasda\pasd_sys\pasd-fire\src\main\java\com\ruoyi\fire\controller\FireFacilityController.java
+C:\DataFromJunhua\DevTools\DevCode\pasx\pasda\pasd_sys\pasd-fire\src\main\java\com\ruoyi\fire\mapper\FireFacilityRepairMapper.java
+C:\DataFromJunhua\DevTools\DevCode\pasx\pasda\pasd_sys\pasd-fire\src\main\java\com\ruoyi\fire\mapper\FireFacilityMapper.java
+C:\DataFromJunhua\DevTools\DevCode\pasx\pasda\pasd_sys\pasd-fire\src\main\java\com\ruoyi\fire\controller\FireFacilityRepairController.java
+C:\DataFromJunhua\DevTools\DevCode\pasx\pasda\pasd_sys\pasd-fire\src\main\java\com\ruoyi\fire\service\IFireFacilityService.java
+C:\DataFromJunhua\DevTools\DevCode\pasx\pasda\pasd_sys\pasd-fire\src\main\java\com\ruoyi\fire\service\IFireFacilityRepairService.java
+C:\DataFromJunhua\DevTools\DevCode\pasx\pasda\pasd_sys\pasd-fire\src\main\java\com\ruoyi\fire\service\impl\FireFacilityRepairServiceImpl.java
+C:\DataFromJunhua\DevTools\DevCode\pasx\pasda\pasd_sys\pasd-fire\src\main\java\com\ruoyi\fire\service\impl\FireFacilityServiceImpl.java
+C:\DataFromJunhua\DevTools\DevCode\pasx\pasda\pasd_sys\pasd-fire\src\main\java\com\ruoyi\fire\domain\FireFacility.java
+C:\DataFromJunhua\DevTools\DevCode\pasx\pasda\pasd_sys\pasd-fire\src\main\java\com\ruoyi\fire\domain\FireFacilityRepair.java