From d4bb9224e835cf0221be254d349efb3d4aaab68b Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 13 Mar 2023 16:46:04 +0800
Subject: [PATCH] 大屏接口实现远程调用
---
blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/entity/FireEntity.java | 2
blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/entity/FireSupplementEntity.java | 2
blade-service/blade-fire/src/main/java/org/springblade/modules/fire/controller/FireController.java | 4
blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/dto/FireSupplementDTO.java | 4
blade-service/blade-dp/src/main/java/org/springblade/modules/dp/mapper/MilitaryLocalCoordinationMapper.xml | 2
blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/vo/FireSupplementVO.java | 4
blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/controller/FireSupplementController.java | 4
blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/mapper/FireSupplementMapper.java | 12 +
blade-service/blade-fire/src/main/java/org/springblade/modules/fire/mapper/FireMapper.xml | 2
blade-service/blade-fire/src/main/java/org/springblade/modules/fire/service/impl/FireServiceImpl.java | 4
blade-service/blade-dp/src/main/java/org/springblade/modules/dp/mapper/MilitaryLocalCoordinationMapper.java | 2
pom.xml | 1
blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/feign/IFireClient.java | 41 ++++++++
blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/ComprehensiveStatisticsController.java | 8
blade-service/blade-fire/src/main/java/org/springblade/modules/fire/mapper/FireMapper.java | 4
blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/service/IFireSupplementService.java | 12 +
blade-service-api/blade-fire-api/pom.xml | 18 +++
blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/FireWarningController.java | 6
blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/MilitaryLocalCoordinationController.java | 29 ++---
blade-service/blade-fire/src/main/java/org/springblade/modules/fire/fegin/FireClient.java | 56 +++++++++++
blade-service/blade-dp/pom.xml | 7
blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/mapper/FireSupplementMapper.xml | 12 ++
blade-service/blade-fire/pom.xml | 7 +
blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/service/impl/FireSupplementServiceImpl.java | 9 +
blade-service/blade-dp/src/main/java/org/springblade/modules/dp/service/impl/MilitaryLocalCoordinationServiceImpl.java | 2
blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/vo/FireVO.java | 4
blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/dto/FireDTO.java | 4
blade-service/blade-fire/src/main/java/org/springblade/modules/fire/service/IFireService.java | 11 +
blade-service-api/pom.xml | 2
29 files changed, 209 insertions(+), 66 deletions(-)
diff --git a/blade-service-api/blade-fire-api/pom.xml b/blade-service-api/blade-fire-api/pom.xml
new file mode 100644
index 0000000..3ada0d1
--- /dev/null
+++ b/blade-service-api/blade-fire-api/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>blade-service-api</artifactId>
+ <groupId>org.springblade</groupId>
+ <version>3.0.1.RELEASE</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>blade-fire-api</artifactId>
+ <name>${project.artifactId}</name>
+ <version>${bladex.project.version}</version>
+ <packaging>jar</packaging>
+
+
+</project>
diff --git a/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/dto/FireDTO.java b/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/dto/FireDTO.java
similarity index 91%
rename from blade-service/blade-fire/src/main/java/org/springblade/modules/fire/dto/FireDTO.java
rename to blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/dto/FireDTO.java
index f6f2ec9..9a0760c 100644
--- a/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/dto/FireDTO.java
+++ b/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/dto/FireDTO.java
@@ -14,11 +14,11 @@
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
-package org.springblade.modules.fire.dto;
+package org.springblade.fire.dto;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.springblade.modules.fire.entity.FireEntity;
+import org.springblade.fire.entity.FireEntity;
/**
* 火灾记录表 数据传输对象实体类
diff --git a/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/dto/FireSupplementDTO.java b/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/dto/FireSupplementDTO.java
similarity index 89%
rename from blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/dto/FireSupplementDTO.java
rename to blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/dto/FireSupplementDTO.java
index 37645ba..6d73c88 100644
--- a/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/dto/FireSupplementDTO.java
+++ b/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/dto/FireSupplementDTO.java
@@ -14,11 +14,11 @@
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
-package org.springblade.modules.fireSupplement.dto;
+package org.springblade.fire.dto;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.springblade.modules.fireSupplement.entity.FireSupplementEntity;
+import org.springblade.fire.entity.FireSupplementEntity;
/**
* 火灾补充表 数据传输对象实体类
diff --git a/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/entity/FireEntity.java b/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/entity/FireEntity.java
similarity index 98%
rename from blade-service/blade-fire/src/main/java/org/springblade/modules/fire/entity/FireEntity.java
rename to blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/entity/FireEntity.java
index 40f561b..eeeada5 100644
--- a/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/entity/FireEntity.java
+++ b/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/entity/FireEntity.java
@@ -14,7 +14,7 @@
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
-package org.springblade.modules.fire.entity;
+package org.springblade.fire.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/entity/FireSupplementEntity.java b/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/entity/FireSupplementEntity.java
similarity index 97%
rename from blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/entity/FireSupplementEntity.java
rename to blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/entity/FireSupplementEntity.java
index 70920c6..3b22941 100644
--- a/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/entity/FireSupplementEntity.java
+++ b/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/entity/FireSupplementEntity.java
@@ -14,7 +14,7 @@
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
-package org.springblade.modules.fireSupplement.entity;
+package org.springblade.fire.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/feign/IFireClient.java b/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/feign/IFireClient.java
new file mode 100644
index 0000000..3c98395
--- /dev/null
+++ b/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/feign/IFireClient.java
@@ -0,0 +1,41 @@
+package org.springblade.fire.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.tool.api.R;
+import org.springblade.fire.entity.FireSupplementEntity;
+import org.springblade.fire.vo.FireSupplementVO;
+import org.springblade.fire.vo.FireVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * fire Feign接口类
+ *
+ * @author guoshilong
+ */
+@FeignClient(
+ value = "blade-fire"
+)
+public interface IFireClient {
+ String API_PREFIX = "/client";
+ String REAL_TIME = API_PREFIX + "/realtimeFireAlarmIncident";
+ String FIRE_ALARM_INCIDENT = API_PREFIX + "/fireAlarmIncident";
+
+ @GetMapping(REAL_TIME)
+ List<FireVO> getRealtime(@RequestParam("time") String time);
+
+ @PostMapping(FIRE_ALARM_INCIDENT)
+ BladePage<FireVO> selectFirePage(@RequestParam("current") Integer current, @RequestParam("size") Integer size, @RequestBody FireVO fire);
+
+ String DISASTER_ASSESSMENT =API_PREFIX + "/disasterAssessment";
+
+ @PostMapping(DISASTER_ASSESSMENT)
+ FireSupplementEntity getSupplementOne(@RequestBody FireSupplementEntity fireSupplementEntity);
+}
diff --git a/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/vo/FireSupplementVO.java b/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/vo/FireSupplementVO.java
similarity index 89%
rename from blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/vo/FireSupplementVO.java
rename to blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/vo/FireSupplementVO.java
index 001a445..c89f64a 100644
--- a/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/vo/FireSupplementVO.java
+++ b/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/vo/FireSupplementVO.java
@@ -14,11 +14,11 @@
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
-package org.springblade.modules.fireSupplement.vo;
+package org.springblade.fire.vo;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.springblade.modules.fireSupplement.entity.FireSupplementEntity;
+import org.springblade.fire.entity.FireSupplementEntity;
/**
* 火灾补充表 视图实体类
diff --git a/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/vo/FireVO.java b/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/vo/FireVO.java
similarity index 93%
rename from blade-service/blade-fire/src/main/java/org/springblade/modules/fire/vo/FireVO.java
rename to blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/vo/FireVO.java
index 8e44d76..dc35719 100644
--- a/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/vo/FireVO.java
+++ b/blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/vo/FireVO.java
@@ -14,11 +14,11 @@
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
-package org.springblade.modules.fire.vo;
+package org.springblade.fire.vo;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.springblade.modules.fire.entity.FireEntity;
+import org.springblade.fire.entity.FireEntity;
/**
* 火灾记录表 视图实体类
diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml
index cafa6da..f0c5228 100644
--- a/blade-service-api/pom.xml
+++ b/blade-service-api/pom.xml
@@ -21,7 +21,7 @@
<module>blade-scope-api</module>
<module>blade-system-api</module>
<module>blade-user-api</module>
- <module>blade-dp-api</module>
+ <module>blade-fire-api</module>
</modules>
<dependencies>
diff --git a/blade-service/blade-dp/pom.xml b/blade-service/blade-dp/pom.xml
index 1ee0530..d63c03b 100644
--- a/blade-service/blade-dp/pom.xml
+++ b/blade-service/blade-dp/pom.xml
@@ -25,13 +25,12 @@
</dependency>
<dependency>
<groupId>org.springblade</groupId>
- <artifactId>blade-fire</artifactId>
- <version>3.0.1.RELEASE</version>
- <scope>compile</scope>
+ <artifactId>blade-system-api</artifactId>
+ <version>${bladex.project.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
- <artifactId>blade-system-api</artifactId>
+ <artifactId>blade-fire-api</artifactId>
<version>${bladex.project.version}</version>
</dependency>
</dependencies>
diff --git a/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/ComprehensiveStatisticsController.java b/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/ComprehensiveStatisticsController.java
index 8a2be1c..fca494b 100644
--- a/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/ComprehensiveStatisticsController.java
+++ b/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/ComprehensiveStatisticsController.java
@@ -5,9 +5,9 @@
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.api.R;
+import org.springblade.fire.feign.IFireClient;
import org.springblade.modules.dp.service.IComprehensiveStatisticsService;
-import org.springblade.modules.fire.service.IFireService;
-import org.springblade.modules.fire.vo.FireVO;
+import org.springblade.fire.vo.FireVO;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -28,7 +28,7 @@
@Api(value = "综合统计", tags = "综合统计接口")
public class ComprehensiveStatisticsController extends BladeController {
private IComprehensiveStatisticsService comprehensiveStatisticsService;
- private IFireService fireService;
+ private IFireClient fireClient;
/**
* 数据概览
@@ -58,7 +58,7 @@
@GetMapping("/realtimeFireAlarmIncident")
@ApiOperation(value = "实时火警事件", notes = "实时火警事件")
public R getRealtimeFireAlarmIncident(@RequestParam(name="time", defaultValue="48")String time) {
- List<FireVO> fireList = fireService.getRealtime(time);
+ List<FireVO> fireList = fireClient.getRealtime(time);
return R.data(fireList);
}
diff --git a/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/FireWarningController.java b/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/FireWarningController.java
index e89b644..c7edadb 100644
--- a/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/FireWarningController.java
+++ b/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/FireWarningController.java
@@ -5,7 +5,7 @@
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.api.R;
-import org.springblade.modules.fire.service.IFireService;
+import org.springblade.fire.feign.IFireClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -21,8 +21,8 @@
@RequestMapping("dp/fireWarning")
@Api(value = "防火预警", tags = "防火预警接口")
public class FireWarningController extends BladeController {
-// private IFireWarningService fireWarningService;
- private IFireService fireService;
+
+ private final IFireClient fireClient;
/**
* 预警台账
diff --git a/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/MilitaryLocalCoordinationController.java b/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/MilitaryLocalCoordinationController.java
index 5936405..20817ec 100644
--- a/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/MilitaryLocalCoordinationController.java
+++ b/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/MilitaryLocalCoordinationController.java
@@ -1,23 +1,17 @@
package org.springblade.modules.dp.controller;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
+import org.springblade.core.mp.support.BladePage;
import org.springblade.core.tool.api.R;
+import org.springblade.fire.entity.FireSupplementEntity;
+import org.springblade.fire.feign.IFireClient;
import org.springblade.modules.dp.service.IMilitaryLocalCoordinationService;
-import org.springblade.modules.fire.service.IFireService;
-import org.springblade.modules.fire.vo.FireVO;
-import org.springblade.modules.fireSupplement.entity.FireSupplementEntity;
-import org.springblade.modules.fireSupplement.service.IFireSupplementService;
-import org.springblade.system.dto.DeptDTO;
+import org.springblade.fire.vo.FireVO;
import org.springblade.system.feign.ISysClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
@@ -34,19 +28,19 @@
@RequestMapping("dp/militaryLocalCoordination")
@Api(value = "军地协同", tags = "军地协同接口")
public class MilitaryLocalCoordinationController extends BladeController {
- private final IFireService fireService;
- private final IFireSupplementService fireSupplementService;
private final IMilitaryLocalCoordinationService militaryLocalCoordinationService;
private final ISysClient sysClient;
+ private final IFireClient fireClient;
+
/**
* 火警事件
*/
@GetMapping("/fireAlarmIncident")
@ApiOperation(value = "火警事件", notes = "火警事件")
- public R<IPage<FireVO>> getEarlyWarningLedger(FireVO fire, Query query) {
- IPage<FireVO> pages = fireService.selectFirePage(Condition.getPage(query), fire);
+ public R<BladePage<FireVO>> getEarlyWarningLedger(FireVO fire, @RequestParam Integer current, @RequestParam Integer size) {
+ BladePage<FireVO> pages = fireClient.selectFirePage(current,size, fire);
return R.data(pages);
}
@@ -56,8 +50,7 @@
@GetMapping("/disasterAssessment")
@ApiOperation(value = "详情", notes = "传入fireSupplement")
public R<FireSupplementEntity> detail(FireSupplementEntity fireSupplement) {
- FireSupplementEntity detail = fireSupplementService.getOne(Condition.getQueryWrapper(fireSupplement));
- return R.data(detail);
+ return R.data(fireClient.getSupplementOne(fireSupplement));
}
/**
@@ -89,6 +82,6 @@
@GetMapping("export-fire-report")
@ApiOperation(value = "导出火灾报告", notes = "传入火灾id")
public void exportUser(String fireId,HttpServletResponse response) {
- militaryLocalCoordinationService.getFireAllDetail(fireId,response);
+// militaryLocalCoordinationService.getFireAllDetail(fireId,response);
}
}
diff --git a/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/mapper/MilitaryLocalCoordinationMapper.java b/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/mapper/MilitaryLocalCoordinationMapper.java
index b1fb94e..a2cd024 100644
--- a/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/mapper/MilitaryLocalCoordinationMapper.java
+++ b/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/mapper/MilitaryLocalCoordinationMapper.java
@@ -1,7 +1,7 @@
package org.springblade.modules.dp.mapper;
import org.apache.ibatis.annotations.Param;
-import org.springblade.modules.fireSupplement.vo.FireSupplementVO;
+import org.springblade.fire.vo.FireSupplementVO;
import org.springframework.stereotype.Repository;
import java.util.HashMap;
diff --git a/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/mapper/MilitaryLocalCoordinationMapper.xml b/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/mapper/MilitaryLocalCoordinationMapper.xml
index 05e938f..7ffccbd 100644
--- a/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/mapper/MilitaryLocalCoordinationMapper.xml
+++ b/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/mapper/MilitaryLocalCoordinationMapper.xml
@@ -26,7 +26,7 @@
AND round(6378.138 * 2 * asin(sqrt(pow( sin(( lat * pi() / 180 - #{lat} * pi() / 180 ) / 2 ), 2 ) + cos( lat * pi() / 180 ) * cos( #{lat} * pi() / 180 ) * pow( sin(( lon * pi() / 180 - #{lon} * pi() / 180 ) / 2 ), 2 ))) * 1000) <= #{distance}
</select>
- <resultMap id="fireAllDetail" type="org.springblade.modules.fireSupplement.vo.FireSupplementVO">
+ <resultMap id="fireAllDetail" type="org.springblade.fire.vo.FireSupplementVO">
<result column="id" property="id"/>
<result column="fire_id" property="fireId"/>
<result column="lon" property="lon"/>
diff --git a/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/service/impl/MilitaryLocalCoordinationServiceImpl.java b/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/service/impl/MilitaryLocalCoordinationServiceImpl.java
index 5cbbec4..4ea0bc1 100644
--- a/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/service/impl/MilitaryLocalCoordinationServiceImpl.java
+++ b/blade-service/blade-dp/src/main/java/org/springblade/modules/dp/service/impl/MilitaryLocalCoordinationServiceImpl.java
@@ -1,8 +1,8 @@
package org.springblade.modules.dp.service.impl;
+import org.springblade.fire.vo.FireSupplementVO;
import org.springblade.modules.dp.mapper.MilitaryLocalCoordinationMapper;
import org.springblade.modules.dp.service.IMilitaryLocalCoordinationService;
-import org.springblade.modules.fireSupplement.vo.FireSupplementVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/blade-service/blade-fire/pom.xml b/blade-service/blade-fire/pom.xml
index 4aa8223..0b7df31 100644
--- a/blade-service/blade-fire/pom.xml
+++ b/blade-service/blade-fire/pom.xml
@@ -23,7 +23,12 @@
<groupId>org.springblade</groupId>
<artifactId>blade-starter-swagger</artifactId>
</dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-fire-api</artifactId>
+ <version>${bladex.project.version}</version>
+ </dependency>
+ </dependencies>
<build>
<plugins>
diff --git a/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/controller/FireController.java b/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/controller/FireController.java
index c5d6471..62a5914 100644
--- a/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/controller/FireController.java
+++ b/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/controller/FireController.java
@@ -27,9 +27,9 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.fire.entity.FireEntity;
+import org.springblade.fire.entity.FireEntity;
+import org.springblade.fire.vo.FireVO;
import org.springblade.modules.fire.service.IFireService;
-import org.springblade.modules.fire.vo.FireVO;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
diff --git a/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/fegin/FireClient.java b/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/fegin/FireClient.java
new file mode 100644
index 0000000..1092839
--- /dev/null
+++ b/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/fegin/FireClient.java
@@ -0,0 +1,56 @@
+package org.springblade.modules.fire.fegin;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.core.tool.api.R;
+import org.springblade.fire.entity.FireSupplementEntity;
+import org.springblade.fire.feign.IFireClient;
+import org.springblade.fire.vo.FireSupplementVO;
+import org.springblade.fire.vo.FireVO;
+import org.springblade.modules.fire.service.IFireService;
+import org.springblade.modules.fireSupplement.service.IFireSupplementService;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.List;
+
+/**
+ * fire Feign
+ *
+ * @author guoshilong
+ */
+@NonDS
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class FireClient implements IFireClient {
+ private IFireService fireService;
+ private IFireSupplementService fireSupplementService;
+
+ @Override
+ @GetMapping(REAL_TIME)
+ public List<FireVO> getRealtime(String time) {
+ return fireService.getRealtime(time);
+ }
+
+ @Override
+ @PostMapping(FIRE_ALARM_INCIDENT)
+ public BladePage<FireVO> selectFirePage(@RequestParam("current") Integer current,@RequestParam("size") Integer size, @RequestBody FireVO fire) {
+ Query query = new Query();
+ query.setCurrent(current);
+ query.setSize(size);
+ IPage<FireVO> fireVOIPage = fireService.selectFirePage(Condition.getPage(query), fire);
+ return BladePage.of(fireVOIPage);
+ }
+
+ @Override
+ @PostMapping(DISASTER_ASSESSMENT)
+ public FireSupplementEntity getSupplementOne(@RequestBody FireSupplementEntity fireSupplementEntity) {
+ FireSupplementEntity one = fireSupplementService.getOne(Condition.getQueryWrapper(fireSupplementEntity));
+ return one;
+ }
+}
diff --git a/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/mapper/FireMapper.java b/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/mapper/FireMapper.java
index f1a6d49..f389975 100644
--- a/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/mapper/FireMapper.java
+++ b/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/mapper/FireMapper.java
@@ -19,8 +19,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
-import org.springblade.modules.fire.entity.FireEntity;
-import org.springblade.modules.fire.vo.FireVO;
+import org.springblade.fire.entity.FireEntity;
+import org.springblade.fire.vo.FireVO;
import java.util.List;
diff --git a/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/mapper/FireMapper.xml b/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/mapper/FireMapper.xml
index 22f6e3c..e7bb5a9 100644
--- a/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/mapper/FireMapper.xml
+++ b/blade-service/blade-fire/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.vo.FireVO">
+ <resultMap id="fireResultMap" type="org.springblade.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"/>
diff --git a/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/service/IFireService.java b/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/service/IFireService.java
index 4ba6e7f..78faadd 100644
--- a/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/service/IFireService.java
+++ b/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/service/IFireService.java
@@ -18,8 +18,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
-import org.springblade.modules.fire.entity.FireEntity;
-import org.springblade.modules.fire.vo.FireVO;
+import org.springblade.fire.entity.FireEntity;
+import org.springblade.fire.vo.FireVO;
import java.util.List;
@@ -47,5 +47,10 @@
*/
List<FireVO> getAll(FireVO fire);
- List<FireVO> getRealtime(String time);
+ /**
+ * 获取实时
+ * @param time 具体前多少小时
+ * @return
+ */
+ List<FireVO> getRealtime(String time);
}
diff --git a/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/service/impl/FireServiceImpl.java b/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/service/impl/FireServiceImpl.java
index 402d857..44e4a11 100644
--- a/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/service/impl/FireServiceImpl.java
+++ b/blade-service/blade-fire/src/main/java/org/springblade/modules/fire/service/impl/FireServiceImpl.java
@@ -18,10 +18,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.modules.fire.entity.FireEntity;
+import org.springblade.fire.entity.FireEntity;
import org.springblade.modules.fire.mapper.FireMapper;
import org.springblade.modules.fire.service.IFireService;
-import org.springblade.modules.fire.vo.FireVO;
+import org.springblade.fire.vo.FireVO;
import org.springframework.stereotype.Service;
import java.util.List;
diff --git a/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/controller/FireSupplementController.java b/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/controller/FireSupplementController.java
index 3912580..7feddd8 100644
--- a/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/controller/FireSupplementController.java
+++ b/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/controller/FireSupplementController.java
@@ -27,9 +27,9 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.fireSupplement.entity.FireSupplementEntity;
+import org.springblade.fire.entity.FireSupplementEntity;
import org.springblade.modules.fireSupplement.service.IFireSupplementService;
-import org.springblade.modules.fireSupplement.vo.FireSupplementVO;
+import org.springblade.fire.vo.FireSupplementVO;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
diff --git a/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/mapper/FireSupplementMapper.java b/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/mapper/FireSupplementMapper.java
index a992f44..e5685ab 100644
--- a/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/mapper/FireSupplementMapper.java
+++ b/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/mapper/FireSupplementMapper.java
@@ -18,8 +18,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.modules.fireSupplement.entity.FireSupplementEntity;
-import org.springblade.modules.fireSupplement.vo.FireSupplementVO;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.fire.entity.FireSupplementEntity;
+import org.springblade.fire.vo.FireSupplementVO;
import java.util.List;
@@ -40,5 +41,10 @@
*/
List<FireSupplementVO> selectFireSupplementPage(IPage page, FireSupplementVO fireSupplement);
-
+ /**
+ * 获取vo详情
+ * @param fireSupplementEntity
+ * @return
+ */
+ FireSupplementVO getVODetail(@Param("sup") FireSupplementEntity fireSupplementEntity);
}
diff --git a/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/mapper/FireSupplementMapper.xml b/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/mapper/FireSupplementMapper.xml
index 094b169..ec4e9f7 100644
--- a/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/mapper/FireSupplementMapper.xml
+++ b/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/mapper/FireSupplementMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="org.springblade.modules.fireSupplement.mapper.FireSupplementMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="fireSupplementResultMap" type="org.springblade.modules.fireSupplement.entity.FireSupplementEntity">
+ <resultMap id="fireSupplementResultMap" type="org.springblade.fire.vo.FireSupplementVO">
<result column="id" property="id"/>
<result column="fire_id" property="fireId"/>
<result column="fire_reason" property="fireReason"/>
@@ -34,5 +34,15 @@
select * from sys_fire_supplement where is_deleted = 0
</select>
+ <select id="getVODetail" resultMap="fireSupplementResultMap">
+ select * from sys_fire_supplement where is_deleted = 0
+ <if test="sup.id !=null and sup.id !=''">
+ AND id = #{sup.id}
+ </if>
+ <if test="sup.fireId !=null and sup.fireId !='' ">
+ AND fire_id = #{sup.fireId}
+ </if>
+ </select>
+
</mapper>
diff --git a/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/service/IFireSupplementService.java b/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/service/IFireSupplementService.java
index aa65e6b..a0de5c0 100644
--- a/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/service/IFireSupplementService.java
+++ b/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/service/IFireSupplementService.java
@@ -17,9 +17,10 @@
package org.springblade.modules.fireSupplement.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
import org.springblade.core.mp.base.BaseService;
-import org.springblade.modules.fireSupplement.entity.FireSupplementEntity;
-import org.springblade.modules.fireSupplement.vo.FireSupplementVO;
+import org.springblade.fire.entity.FireSupplementEntity;
+import org.springblade.fire.vo.FireSupplementVO;
/**
* 火灾补充表 服务类
@@ -38,5 +39,10 @@
*/
IPage<FireSupplementVO> selectFireSupplementPage(IPage<FireSupplementVO> page, FireSupplementVO fireSupplement);
-
+ /**
+ * 获取vo详情
+ * @param fireSupplementEntity
+ * @return
+ */
+ FireSupplementVO getVODetail(FireSupplementEntity fireSupplementEntity);
}
diff --git a/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/service/impl/FireSupplementServiceImpl.java b/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/service/impl/FireSupplementServiceImpl.java
index 6c86b97..6005ff4 100644
--- a/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/service/impl/FireSupplementServiceImpl.java
+++ b/blade-service/blade-fire/src/main/java/org/springblade/modules/fireSupplement/service/impl/FireSupplementServiceImpl.java
@@ -18,10 +18,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.modules.fireSupplement.entity.FireSupplementEntity;
+import org.springblade.fire.entity.FireSupplementEntity;
import org.springblade.modules.fireSupplement.mapper.FireSupplementMapper;
import org.springblade.modules.fireSupplement.service.IFireSupplementService;
-import org.springblade.modules.fireSupplement.vo.FireSupplementVO;
+import org.springblade.fire.vo.FireSupplementVO;
import org.springframework.stereotype.Service;
/**
@@ -38,5 +38,10 @@
return page.setRecords(baseMapper.selectFireSupplementPage(page, fireSupplement));
}
+ @Override
+ public FireSupplementVO getVODetail(FireSupplementEntity fireSupplementEntity) {
+ return baseMapper.getVODetail(fireSupplementEntity);
+ }
+
}
diff --git a/pom.xml b/pom.xml
index 87ab641..7c83b8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,6 @@
<module>blade-plugin-api</module>
<module>blade-service</module>
<module>blade-service-api</module>
- <module>blade-dp</module>
</modules>
<dependencyManagement>
--
Gitblit v1.9.3