查看火灾详情

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/FireSiteControllerWeb.java

@@ -3,9 +3,8 @@ package com.bizmatics.mhfire.controller.web;
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.mhfire.model.FireSite;
+import com.bizmatics.mhfire.model.FireSiteDetail;
 import com.bizmatics.mhfire.service.FireSiteService;
-import com.bizmatics.mhfire.service.vo.FireSiteDutyVO;
-import com.bizmatics.mhfire.service.vo.FireSiteVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -43,20 +42,10 @@ public class FireSiteControllerWeb {
      * @return
      */
     @GetMapping("/one")
-    public ApiResult<FireSiteVO> getOne(@RequestParam String id){
+    public ApiResult<List<FireSiteDetail>> getOne(@RequestParam String id){
         return ApiResult.success(fireSiteService.getOne(id));
     }
 
-    /**
-     * 站点执勤实力
-     * @param fireSiteId
-     * @return
-     */
-    @GetMapping("/fireSiteDuty")
-    public ApiResult<List<FireSiteDutyVO>> getFireSiteDuty(@RequestParam String fireSiteId){
-        return ApiResult.success(fireSiteService.getFireSiteDuty(fireSiteId));
-    }
-
     @GetMapping("/addList")
     public void addList(@RequestBody List<FireSite> fireSite){
         fireSiteService.saveBatch(fireSite);

mhfire-model/src/main/java/com/bizmatics/mhfire/model/FireSite.java

@@ -61,6 +61,4 @@ public class FireSite implements Serializable {
     private String wd;
 
     private Integer xfzlx;
-
-
 }

mhfire-model/src/main/java/com/bizmatics/mhfire/model/FireSiteDetail.java

@@ -1,11 +1,13 @@
 package com.bizmatics.mhfire.model;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.util.List;
+
 /**
  * <p>
  * 消防站点详情
@@ -70,4 +72,6 @@ public class FireSiteDetail implements Serializable {
     private String ssxfjgid;
 
 
+    @TableField(exist = false)
+    private List<CarPerson> carList;
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/FireSiteService.java

@@ -3,8 +3,7 @@ package com.bizmatics.mhfire.service;
 import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.mvc.base.CrudService;
 import com.bizmatics.mhfire.model.FireSite;
-import com.bizmatics.mhfire.service.vo.FireSiteDutyVO;
-import com.bizmatics.mhfire.service.vo.FireSiteVO;
+import com.bizmatics.mhfire.model.FireSiteDetail;
 
 import java.util.List;
 
@@ -28,14 +27,7 @@ public interface FireSiteService extends CrudService<FireSite> {
      * @param id
      * @return
      */
-    FireSiteVO getOne(String id);
-
-    /**
-     * 站点执勤实力
-     * @param fireSiteId
-     * @return
-     */
-    List<FireSiteDutyVO> getFireSiteDuty(String fireSiteId);
+    List<FireSiteDetail> getOne(String id);
 
 
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/FireSiteServiceImpl.java

@@ -2,19 +2,24 @@ package com.bizmatics.mhfire.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.mhfire.model.CarPerson;
 import com.bizmatics.mhfire.model.FireSite;
+import com.bizmatics.mhfire.model.FireSiteDetail;
 import com.bizmatics.mhfire.persistence.mapper.FireSiteMapper;
+import com.bizmatics.mhfire.service.CarPersonService;
+import com.bizmatics.mhfire.service.FireSiteDetailService;
 import com.bizmatics.mhfire.service.FireSiteService;
-import com.bizmatics.mhfire.service.vo.FireSiteDutyVO;
-import com.bizmatics.mhfire.service.vo.FireSiteVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author yq
@@ -22,6 +27,12 @@ import java.util.List;
  */
 @Service
 public class FireSiteServiceImpl extends AbstractCrudService<FireSiteMapper, FireSite> implements FireSiteService {
+
+    @Autowired
+    private FireSiteDetailService fireSiteDetailService;
+
+    @Autowired
+    private CarPersonService carPersonService;
     @Override
     public CommonPage<FireSite> page(Integer current, Integer size) {
         IPage<FireSite> page = new Page<>(current, size);
@@ -31,16 +42,23 @@ public class FireSiteServiceImpl extends AbstractCrudService<FireSiteMapper, Fir
     }
 
     @Override
-    public FireSiteVO getOne(String id) {
-        FireSiteVO fireSiteVO = new FireSiteVO();
-        //TODO 站点信息调用其他平台接口
-        return fireSiteVO;
-    }
+    public List<FireSiteDetail> getOne(String id) {
+        LambdaQueryWrapper<FireSiteDetail> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(FireSiteDetail::getSsxfjgid,id);
+        List<FireSiteDetail> fireSiteDetails = fireSiteDetailService.list(queryWrapper);
+        List<String> cIdList = fireSiteDetails.stream().map(FireSiteDetail::getId).collect(Collectors.toList());
+        List<CarPerson> list = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(cIdList)){
+            LambdaQueryWrapper<CarPerson> carPersonLambdaQueryWrapper = Wrappers.lambdaQuery();
+            carPersonLambdaQueryWrapper.in(CollectionUtils.isNotEmpty(cIdList),CarPerson::getClId,cIdList);
+            list = carPersonService.list(carPersonLambdaQueryWrapper);
+        }
+        List<CarPerson> finalList = list;
+        fireSiteDetails = fireSiteDetails.stream().peek(fd ->
+                fd.setCarList(finalList.stream().filter(carPerson -> carPerson.getClId().equals(fd.getId())).collect(Collectors.toList()))
+        ).collect(Collectors.toList());
+        return fireSiteDetails;
 
-    @Override
-    public List<FireSiteDutyVO> getFireSiteDuty(String fireSiteId) {
-        List<FireSiteDutyVO> list = new ArrayList<>();
-        //TODO 站点执勤实力信息调用其他平台接口
-        return list;
     }
+
 }