Browse Source

添加查看详情信息

yq 3 years ago
parent
commit
ea3b23a5b7

+ 6 - 0
mhfire-mapping/src/main/java/com/bizmatics/mhfire/persistence/mapper/CarPersonMapper.java

@@ -2,6 +2,9 @@ package com.bizmatics.mhfire.persistence.mapper;
 
 import com.bizmatics.mhfire.model.CarPerson;
 import com.bizmatics.common.mvc.base.CrudMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,7 @@ import com.bizmatics.common.mvc.base.CrudMapper;
  */
 public interface CarPersonMapper extends CrudMapper<CarPerson> {
 
+
+
+    List<CarPerson> selectByAjId(@Param("ajId") String ajId);
 }

+ 9 - 0
mhfire-mapping/src/main/resources/mapper/mysql/CarPersonMapper.xml

@@ -11,5 +11,14 @@
         <result column="name" property="name" />
         <result column="clId" property="clId" />
     </resultMap>
+    <select id="selectByAjId" resultType="com.bizmatics.mhfire.model.CarPerson">
+        select cp.*
+        from car_person as cp
+        inner join jcj_cjjl as jc
+        on cp.clId = jc.CJBH
+        inner join alert as a
+        on jc.JCJ_AJXX_ID = a.id
+        where a.id = #{ajId}
+    </select>
 
 </mapper>

+ 6 - 2
mhfire-model/src/main/java/com/bizmatics/mhfire/model/Alert.java

@@ -10,6 +10,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -121,6 +122,9 @@ public class Alert implements Serializable {
      */
     @TableField(exist = false)
     private String nonFatal;
-
-
+    /**
+     * 关联案件的车辆信息
+     */
+    @TableField(exist = false)
+    private List<CarPerson> carList;
 }

+ 9 - 0
mhfire-service/src/main/java/com/bizmatics/mhfire/service/CarPersonService.java

@@ -3,6 +3,8 @@ package com.bizmatics.mhfire.service;
 import com.bizmatics.mhfire.model.CarPerson;
 import com.bizmatics.common.mvc.base.CrudService;
 
+import java.util.List;
+
 /**
  * <p>
  * 车辆人员信息 服务类
@@ -13,4 +15,11 @@ import com.bizmatics.common.mvc.base.CrudService;
  */
 public interface CarPersonService extends CrudService<CarPerson> {
 
+
+    /**
+     * 根据案件id查询车辆信息
+     * @param ajId
+     * @return
+     */
+    List<CarPerson> getByAjId(String ajId);
 }

+ 10 - 0
mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/AlertServiceImpl.java

@@ -11,10 +11,12 @@ import com.bizmatics.common.core.util.DateUtils;
 import com.bizmatics.common.core.util.StringUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.mhfire.model.Alert;
+import com.bizmatics.mhfire.model.CarPerson;
 import com.bizmatics.mhfire.persistence.mapper.AlertMapper;
 import com.bizmatics.mhfire.persistence.mapper.po.FireStatisticsPO;
 import com.bizmatics.mhfire.persistence.mapper.vo.LocateInfo;
 import com.bizmatics.mhfire.service.AlertService;
+import com.bizmatics.mhfire.service.CarPersonService;
 import com.bizmatics.mhfire.service.FireStatisticsService;
 import com.bizmatics.mhfire.service.util.Arith;
 import com.bizmatics.mhfire.service.util.GouldUtil;
@@ -36,6 +38,10 @@ public class AlertServiceImpl extends AbstractCrudService<AlertMapper, Alert> im
     @Autowired
     private FireStatisticsService fireStatisticsService;
 
+    @Autowired
+    private CarPersonService carPersonService;
+
+
     private static final String[] ALERT_TYPE = {"火灾","社会救助","抢险救援"};
 
     @Override
@@ -141,6 +147,7 @@ public class AlertServiceImpl extends AbstractCrudService<AlertMapper, Alert> im
             Date endTime = DateUtils.addMonths(alert.getLasj(), 30);
             List<LocateInfo> lonLat = GouldUtil.getLonLat(alert.getAfdz());
             LocateInfo locateInfo = lonLat.get(0);
+            //计算精度维度在一定范围内的数据和火灾关联
             List<FireStatisticsPO> list = fireStatisticsService.distanceList(locateInfo.getLongitude(), locateInfo.getLatitude(), startTime, endTime);
             if (CollectionUtils.isNotEmpty(list)){
                 FireStatisticsPO fireStatisticsPo = list.get(0);
@@ -149,6 +156,9 @@ public class AlertServiceImpl extends AbstractCrudService<AlertMapper, Alert> im
                 alert.setNonFatal(fireStatisticsPo.getNonFatal());
             }
         }
+        //查询车辆和人员信息
+        List<CarPerson> carLit = carPersonService.getByAjId(alert.getId());
+        alert.setCarList(carLit);
         return alert;
     }
 

+ 6 - 0
mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/CarPersonServiceImpl.java

@@ -6,6 +6,8 @@ import com.bizmatics.mhfire.service.CarPersonService;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 车辆人员信息 服务实现类
@@ -17,4 +19,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class CarPersonServiceImpl extends AbstractCrudService<CarPersonMapper, CarPerson> implements CarPersonService {
 
+    @Override
+    public List<CarPerson> getByAjId(String ajId) {
+        return baseMapper.selectByAjId(ajId);
+    }
 }