From b195148e1b60361197cfb5abe6e283f2cd5a7454 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 07 Mar 2023 17:02:03 +0800
Subject: [PATCH] 火灾补录
---
src/main/java/org/springblade/modules/fire/entity/FireEntity.java | 10 +++++
src/main/java/org/springblade/modules/fire/service/IFireService.java | 9 ++++
src/main/java/org/springblade/modules/fire/mapper/FireMapper.xml | 37 +++++++++++++++++-
src/main/java/org/springblade/modules/fire/vo/FireVO.java | 6 +++
src/main/java/org/springblade/modules/fire/mapper/FireMapper.java | 1
src/main/java/org/springblade/modules/fire/controller/FireController.java | 13 ++++++
src/main/java/org/springblade/modules/fire/service/impl/FireServiceImpl.java | 7 +++
7 files changed, 79 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/fire/controller/FireController.java b/src/main/java/org/springblade/modules/fire/controller/FireController.java
index d5d51a3..90eb211 100644
--- a/src/main/java/org/springblade/modules/fire/controller/FireController.java
+++ b/src/main/java/org/springblade/modules/fire/controller/FireController.java
@@ -35,6 +35,8 @@
import org.springblade.modules.fire.service.IFireService;
import org.springblade.core.boot.ctrl.BladeController;
+import java.util.List;
+
/**
* 火灾记录表 控制器
*
@@ -82,6 +84,17 @@
}
/**
+ * 火灾记录表 自定义分页
+ */
+ @GetMapping("/all")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入fire")
+ public R getAll(FireVO fire) {
+ List<FireVO> list = fireService.getAll(fire);
+ return R.data(list);
+ }
+
+ /**
* 火灾记录表 新增
*/
@PostMapping("/save")
diff --git a/src/main/java/org/springblade/modules/fire/entity/FireEntity.java b/src/main/java/org/springblade/modules/fire/entity/FireEntity.java
index 5fb206a..3b5f42a 100644
--- a/src/main/java/org/springblade/modules/fire/entity/FireEntity.java
+++ b/src/main/java/org/springblade/modules/fire/entity/FireEntity.java
@@ -57,6 +57,16 @@
@TableField(value = "location",typeHandler = FastjsonTypeHandler.class)
private Object location;
/**
+ * 经度
+ */
+ @ApiModelProperty(value = "经度")
+ private String lon;
+ /**
+ * 纬度
+ */
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+ /**
* 发现方式
*/
@ApiModelProperty(value = "发现方式")
diff --git a/src/main/java/org/springblade/modules/fire/mapper/FireMapper.java b/src/main/java/org/springblade/modules/fire/mapper/FireMapper.java
index ef6b6b8..a201461 100644
--- a/src/main/java/org/springblade/modules/fire/mapper/FireMapper.java
+++ b/src/main/java/org/springblade/modules/fire/mapper/FireMapper.java
@@ -41,4 +41,5 @@
List<FireVO> selectFirePage(IPage page, @Param("fire") FireVO fire);
+ List<FireVO> getAll(@Param("fire") FireVO fire);
}
diff --git a/src/main/java/org/springblade/modules/fire/mapper/FireMapper.xml b/src/main/java/org/springblade/modules/fire/mapper/FireMapper.xml
index c89abc8..4621d96 100644
--- a/src/main/java/org/springblade/modules/fire/mapper/FireMapper.xml
+++ b/src/main/java/org/springblade/modules/fire/mapper/FireMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="org.springblade.modules.fire.mapper.FireMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="fireResultMap" type="org.springblade.modules.fire.entity.FireEntity">
+ <resultMap id="fireResultMap" type="org.springblade.modules.fire.vo.FireVO">
<result column="id" property="id"/>
<result column="no" property="no"/>
<result column="location" property="location" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
@@ -20,13 +20,44 @@
<result column="update_time" property="updateTime"/>
<result column="is_deleted" property="isDeleted"/>
<result column="tenant_id" property="tenantId"/>
+ <result column="supplementId" property="supplementId"/>
</resultMap>
<select id="selectFirePage" resultMap="fireResultMap">
- select * from sys_fire where is_deleted = 0
+ select fire.*,sup.id supplementId from sys_fire fire
+ LEFT JOIN sys_fire_supplement sup ON sup.fire_id = fire.id AND sup.is_deleted = 0
+ where fire.is_deleted = 0
<if test="fire.location !=null and fire.location !='' ">
- AND location = #{fire.location,typeHandler=com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler}
+ AND fire.location = #{fire.location,typeHandler=com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler}
+ </if>
+ <if test="fire.no !=null and fire.no !=''">
+ AND fire.no LIKE CONCAT('%',#{fire.no},'%')
+ </if>
+ <if test="fire.address !=null and fire.address !=''">
+ AND fire.address LIKE CONCAT('%',#{fire.address},'%')
+ </if>
+ <if test="fire.findWay!=null and fire.findWay !=''">
+ AND fire.find_way = #{fire.findWay}
+ </if>
+ <if test="fire.status!=null and fire.status !=''">
+ AND fire.status = #{fire.status}
+ </if>
+ <if test="fire.alarmTimeStart !=null and fire.alarmTimeStart !=''">
+ AND DATE_FORMAT(fire.alarm_time,'%Y-%m-%d') >= #{fire.alarmTimeStart}
+ </if>
+ <if test="fire.alarmTimeEnd !=null and fire.alarmTimeEnd !=''">
+ AND DATE_FORMAT(fire.alarm_time,'%Y-%m-%d') <= #{fire.alarmTimeEnd}
+ </if>
+
+
+ </select>
+ <select id="getAll" resultMap="fireResultMap">
+ select fire.*,sup.id supplementId from sys_fire fire
+ LEFT JOIN sys_fire_supplement sup ON sup.fire_id = fire.id AND sup.is_deleted = 0
+ where fire.is_deleted = 0 AND sup.id IS NULL
+ <if test="fire.no !=null and fire.no !=''">
+ AND fire.no LIKE CONCAT('%',#{fire.no},'%')
</if>
</select>
diff --git a/src/main/java/org/springblade/modules/fire/service/IFireService.java b/src/main/java/org/springblade/modules/fire/service/IFireService.java
index 2193f11..4ea7063 100644
--- a/src/main/java/org/springblade/modules/fire/service/IFireService.java
+++ b/src/main/java/org/springblade/modules/fire/service/IFireService.java
@@ -21,6 +21,8 @@
import org.springblade.core.mp.base.BaseService;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
/**
* 火灾记录表 服务类
*
@@ -38,5 +40,10 @@
*/
IPage<FireVO> selectFirePage(IPage<FireVO> page, FireVO fire);
-
+ /**
+ * 获取所有
+ * @param fire
+ * @return
+ */
+ List<FireVO> getAll(FireVO fire);
}
diff --git a/src/main/java/org/springblade/modules/fire/service/impl/FireServiceImpl.java b/src/main/java/org/springblade/modules/fire/service/impl/FireServiceImpl.java
index c2738fe..4260c5c 100644
--- a/src/main/java/org/springblade/modules/fire/service/impl/FireServiceImpl.java
+++ b/src/main/java/org/springblade/modules/fire/service/impl/FireServiceImpl.java
@@ -24,6 +24,8 @@
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
/**
* 火灾记录表 服务实现类
*
@@ -38,5 +40,10 @@
return page.setRecords(baseMapper.selectFirePage(page, fire));
}
+ @Override
+ public List<FireVO> getAll(FireVO fire) {
+ return baseMapper.getAll(fire);
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/fire/vo/FireVO.java b/src/main/java/org/springblade/modules/fire/vo/FireVO.java
index d0a0c7c..36c5541 100644
--- a/src/main/java/org/springblade/modules/fire/vo/FireVO.java
+++ b/src/main/java/org/springblade/modules/fire/vo/FireVO.java
@@ -32,4 +32,10 @@
public class FireVO extends FireEntity {
private static final long serialVersionUID = 1L;
+ private String supplementId;
+
+ private String alarmTimeStart;
+
+ private String alarmTimeEnd;
+
}
--
Gitblit v1.9.3