增加指挥接口类

amos-boot-jcs-system/pom.xml

@@ -17,11 +17,11 @@
 			<artifactId>amos-boot-module-jcs-biz</artifactId>
 			<version>${amos-biz-boot.version}</version>
 		</dependency>
-		<!-- <dependency>
+		<dependency>
 			<groupId>com.amosframework.boot</groupId>
-			<artifactId>amos-boot-module-common-biz</artifactId>
+			<artifactId>amos-boot-module-command-biz</artifactId>
 			<version>${amos-biz-boot.version}</version>
-		</dependency> -->
+		</dependency>
   </dependencies>
 
     <build>

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/explain.md

+实战指挥接口清单：
+跑马灯：
+1：实时气象，地震 信息播报（具体看来源方式）,
+2:  24小时气象，地震信息列表查看
+战备值守地图屏：
+1：新警情，以及警情状态修改通知  ，mqtt 通知
+2：未结案警情（不含归并警情），可通过警情地址模糊匹配，无需分页。
+3：地图点击灾情，可查询警情相关信息接口（默认按警情id 查询）
+战备值守业务屏：
+暂无
+应急指挥地图屏：
+1:微型消防站 分页列表，（根据与灾情距离，由近到远排序，）
+具体字段 按之前列表字段显示，增加 距离字段。
+2：根据微型消防站 ，查询微型消防站详情，
+3：水源分页列表（根据与灾情距离，由近到远排序，） 距离作为条件，具体字段 按之前列表字段显示，增加 距离字段。
+4：根据水源id ，查询水源详情。
+5：消防车辆 分页列表   具体字段 按之前列表字段显示
+6：根据车辆id 查看车辆详情
+7：获取车辆gprs 数据推送。Mqtt 通知web
+8：消防队伍 分页列表 （可根据队伍类型筛选）
+9: 根据队伍id ，查询队伍详情
+10：
+
+
+应急指挥业务屏：
+灾情信息
+1: 根据灾情信息，查询特定灾情信息
+2：
+
+

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/pom.xml

@@ -18,6 +18,12 @@
 			<artifactId>amos-boot-module-common-api</artifactId>
 			<version>${amos-biz-boot.version}</version>
 		</dependency>
+		  <dependency>
+			  <groupId>com.amosframework.boot</groupId>
+			  <artifactId>amos-boot-module-jcs-api</artifactId>
+			  <version>1.0.0</version>
+			  <scope>compile</scope>
+		  </dependency>
   </dependencies>
 
 </project>

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

+package com.yeejoin.amos.boot.module.command.biz.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.*;
+import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
+import com.yeejoin.amos.boot.module.common.api.service.IFireStationService;
+import com.yeejoin.amos.boot.module.common.api.service.IFireTeamService;
+import com.yeejoin.amos.boot.module.common.api.service.IWaterResourceService;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledZhDto;
+import com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * *指挥资源Api
+ *
+ * <PRE>
+ * author tw
+ * date 2021/7/15
+ * </PRE>
+ */
+@RestController
+@Api(tags = "指挥资源Api")
+@RequestMapping(value = "/command")
+public class CommandController extends BaseController {
+
+    @Autowired
+    IAlertCalledService iAlertCalledService;
+    @Autowired
+    IFireStationService iFireStationService;
+    @Autowired
+    IFireTeamService iFireTeamService;
+    @Autowired
+    IWaterResourceService iWaterResourceService;
+
+
+
+    /**
+     * 警情列表
+     *
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "JQ/list")
+    @ApiOperation(httpMethod = "GET", value = "警情列表分页查询", notes = "警情列表分页查询")
+    public ResponseModel<Object> listPage(String address) {
+        List<AlertCalledZhDto> list= iAlertCalledService.alertCalledListByAlertStatus(address);
+        return ResponseHelper.buildResponse(list);
+    }
+
+    /**
+     * 微型消防站列表分页查询
+     *
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "WX/list")
+    @ApiOperation(httpMethod = "GET", value = "微型消防站列表分页查询", notes = "微型消防站列表分页查询")
+    public ResponseModel<IPage<FireStationzhDto>> listPageWx(Integer pageNum, Integer pageSize, RequestData par) {
+        Page<FireStationzhDto> pageBean = new Page<>(pageNum, pageSize);
+        List<FireStationzhDto>  list= iFireStationService.getStationList(pageNum,pageSize,par);
+        Integer num=  iFireStationService.getStationListCount(par);
+        pageBean.setRecords(list);
+        pageBean.setTotal(num);
+        return ResponseHelper.buildResponse(pageBean);
+    }
+    /**
+     * 水源列表分页查询
+     *
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "SY/list")
+    @ApiOperation(httpMethod = "GET", value = "水源列表分页查询", notes = "水源列表分页查询")
+    public ResponseModel<IPage<WaterResourceZhDto>> listPageSy(Integer pageNum, Integer pageSize, RequestData par) {
+        Page<WaterResourceZhDto> pageBean = new Page<>(pageNum, pageSize);
+        List<WaterResourceZhDto>  list= iWaterResourceService.getWaterResourceList(pageNum,pageSize,par);
+        Integer num=  iWaterResourceService.getWaterResourceListCount(par);
+        pageBean.setRecords(list);
+        pageBean.setTotal(num);
+        return ResponseHelper.buildResponse(pageBean);
+    }
+    /**
+     * 消防队伍列表分页查询
+     *
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "DW/list")
+    @ApiOperation(httpMethod = "GET", value = "消防队伍列表分页查询", notes = "消防队伍列表分页查询")
+    public ResponseModel<IPage<FireTeamZhDto>> listPage(Integer pageNum, Integer pageSize, RequestData par) {
+        Page<FireTeamZhDto> pageBean = new Page<>(pageNum, pageSize);
+        List<FireTeamZhDto>  list= iFireTeamService.getFireTeamList(pageNum,pageSize,par);
+        Integer num=  iFireTeamService.getFireTeamListCount(par);
+        pageBean.setRecords(list);
+        pageBean.setTotal(num);
+        return ResponseHelper.buildResponse(pageBean);
+    }
+
+
+
+    /**
+     *
+     * 根据id查询警情详情
+     *
+     * **/
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "JQ/{id}")
+    @ApiOperation(httpMethod = "GET", value = "根据id查询灾情详情", notes = "根据id查询灾情详情")
+    public ResponseModel<Object> selectById(@PathVariable Long id) {
+
+        return ResponseHelper.buildResponse(iAlertCalledService.selectAlertCalledById(id));
+
+    }
+
+
+
+    /**
+     * 根据id查询微型消防站
+     *
+     * @param id 主键
+     *
+     */
+    @TycloudOperation(needAuth = false,ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "WX//{id}")
+    @ApiOperation(httpMethod = "GET", value = "根据id查询微型消防站", notes = "根据id查询微型消防站")
+    public ResponseModel<FireStationDto> seleteOne(@PathVariable Long id) {
+        return ResponseHelper.buildResponse(iFireStationService.selectBySequenceNbr(id));
+    }
+
+
+
+
+    /**
+     * 根据id查询水源
+     *
+     * @param id 主键
+     *
+     */
+    @TycloudOperation(needAuth = false,ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "SY//{id}")
+    @ApiOperation(httpMethod = "GET", value = "根据id查询水源", notes = "根据id查询水源")
+    public ResponseModel<WaterResourceDto> selectOne(@PathVariable Long id) {
+        return ResponseHelper.buildResponse(iWaterResourceService.selectBySequenceNbr(id));
+    }
+
+
+    /**
+     * 根据id查询队伍信息
+     *
+     * @param id
+     * @return
+     */
+    @TycloudOperation(needAuth = false,ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "DW/{id}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据id查询队伍信息", notes = "根据id查询队伍信息")
+    public ResponseModel<FireTeam> selectById(HttpServletRequest request, @PathVariable Long id) {
+        return ResponseHelper.buildResponse(iFireTeamService.getFireTeamBySequenceNbr(id));
+    }
+
+}
\ No newline at end of file