警情综合和撒点相关接口代码开发

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemPoliceInfoController.java

@@ -6,6 +6,7 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.fire.domain.DemPoliceInfo;
 import com.usky.fire.service.DemMicroStationService;
 import com.usky.fire.service.DemPoliceInfoService;
+import com.usky.fire.service.DemVehicleFightService;
 import com.usky.fire.service.DemWaterSourceService;
 import com.usky.fire.service.vo.AlertStatisticsVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +39,9 @@ public class DemPoliceInfoController {
     @Autowired
     private DemWaterSourceService demWaterSourceService;
 
+    @Autowired
+    private DemVehicleFightService demVehicleFightService;
+
     /**
      * 综合警情-撒点
      *
@@ -139,5 +143,17 @@ public class DemPoliceInfoController {
         return ApiResult.success(demWaterSourceService.waterSourceList(longitude, latitude, pageNum, pageSize));
     }
 
+    /**
+     * 综合警情-警力实况
+     *
+     * @param policeId 案件信息ID
+     * @return
+     */
+    @GetMapping("/vehicleFightList")
+    public ApiResult<List<Map<String, Object>>> vehicleFightList(@RequestParam(value = "policeId") String policeId) {
+        return ApiResult.success(demVehicleFightService.vehicleFightList(policeId));
+    }
+
+
 }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemVehicleFightService.java

@@ -3,6 +3,9 @@ package com.usky.fire.service;
 import com.usky.fire.domain.DemVehicleFight;
 import com.usky.common.mybatis.core.CrudService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 车辆作战信息 服务类
@@ -13,4 +16,5 @@ import com.usky.common.mybatis.core.CrudService;
  */
 public interface DemVehicleFightService extends CrudService<DemVehicleFight> {
 
+    List<Map<String, Object>> vehicleFightList(String policeId);
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemVehicleService.java

@@ -4,6 +4,8 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.DemVehicle;
 
+import java.util.List;
+
 /**
  * <p>
  * 车辆信息 服务类
@@ -39,4 +41,6 @@ public interface DemVehicleService extends CrudService<DemVehicle> {
      * @param id 主键ID
      */
     void delVehicle(Integer id);
+
+    List<DemVehicle> vehicleList(List<String> vehicleIdList);
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemPoliceInfoServiceImpl.java

@@ -150,9 +150,10 @@ public class DemPoliceInfoServiceImpl extends AbstractCrudService<DemPoliceInfoM
         IPage<DemPoliceInfo> page = new Page<>(1, 500);
         LambdaQueryWrapper<DemPoliceInfo> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(DemPoliceInfo::getAddress, DemPoliceInfo::getGisX, DemPoliceInfo::getGisY,
-                DemPoliceInfo::getId)
+                DemPoliceInfo::getId,DemPoliceInfo::getCaseType,DemPoliceInfo::getSquadron,
+                DemPoliceInfo::getFilingTime,DemPoliceInfo::getSupplement,DemPoliceInfo::getPoliceId)
                 .eq(StringUtils.isNotBlank(streetTown), DemPoliceInfo::getStreetTown, streetTown)
-                .eq(DemPoliceInfo::getQuenchTime, "")
+                .isNotNull(DemPoliceInfo::getQuenchTime)
                 .orderByDesc(DemPoliceInfo::getId);
         page = this.page(page, queryWrapper);
         List<Map<String, Object>> list = new ArrayList<>();
@@ -160,9 +161,15 @@ public class DemPoliceInfoServiceImpl extends AbstractCrudService<DemPoliceInfoM
             for (int i = 0; i < page.getRecords().size(); i++) {
                 Map<String, Object> map = new HashMap<>();
                 map.put("id", page.getRecords().get(i).getId());
+                map.put("policeId", page.getRecords().get(i).getPoliceId());
                 map.put("address", page.getRecords().get(i).getAddress());
                 map.put("longitude", page.getRecords().get(i).getGisX());
                 map.put("latitude", page.getRecords().get(i).getGisY());
+                map.put("caseType", page.getRecords().get(i).getCaseType());
+                map.put("squadron", page.getRecords().get(i).getSquadron());
+                map.put("filingTime", page.getRecords().get(i).getFilingTime());
+                map.put("AlarmTime", page.getRecords().get(i).getFilingTime());
+                map.put("supplement", page.getRecords().get(i).getSupplement());
                 list.add(map);
             }
         }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemVehicleFightServiceImpl.java

@@ -1,11 +1,22 @@
 package com.usky.fire.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.fire.domain.DemVehicle;
 import com.usky.fire.domain.DemVehicleFight;
 import com.usky.fire.mapper.DemVehicleFightMapper;
 import com.usky.fire.service.DemVehicleFightService;
-import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.fire.service.DemVehicleService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 车辆作战信息 服务实现类
@@ -16,5 +27,44 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class DemVehicleFightServiceImpl extends AbstractCrudService<DemVehicleFightMapper, DemVehicleFight> implements DemVehicleFightService {
+    @Autowired
+    private DemVehicleService demVehicleService;
+
+    @Override
+    public List<Map<String, Object>> vehicleFightList(String policeId) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        LambdaQueryWrapper<DemVehicleFight> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemVehicleFight::getId, DemVehicleFight::getVehicleId, DemVehicleFight::getCommander,
+                DemVehicleFight::getReporter, DemVehicleFight::getSoldier, DemVehicleFight::getDriver,
+                DemVehicleFight::getOrgaAbbreviat,DemVehicleFight::getDthh)
+                .eq(DemVehicleFight::getCaseId, policeId);
+        List<DemVehicleFight> list1 = this.list(queryWrapper);
+        if (CollectionUtils.isNotEmpty(list1)) {
+            List<String> vehicleIdList = new ArrayList<>();
+            for (int i = 0; i < list1.size(); i++) {
+                vehicleIdList.add(list1.get(i).getVehicleId());
+            }
+            List<DemVehicle> demVehicles = demVehicleService.vehicleList(vehicleIdList);
+            for (int i = 0; i < list1.size(); i++) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("commander", list1.get(i).getCommander());
+                map.put("reporter", list1.get(i).getReporter());
+                map.put("soldier", list1.get(i).getSoldier());
+                map.put("driver", list1.get(i).getDriver());
+                map.put("orgaAbbreviat", list1.get(i).getOrgaAbbreviat());
+                map.put("dthh", list1.get(i).getDthh());
+                map.put("licensePlate", null);
+                if (CollectionUtils.isNotEmpty(demVehicles)) {
+                    for (int j = 0; j < demVehicles.size(); j++) {
+                        if (list1.get(i).getVehicleId().equals(demVehicles.get(j).getVehicleId())) {
+                            map.put("licensePlate", demVehicles.get(j).getLicensePlate());
+                        }
+                    }
+                }
+                list.add(map);
+            }
+        }
+        return list;
+    }
 
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemVehicleServiceImpl.java

@@ -6,11 +6,10 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.common.core.bean.CommonPage;
-import com.usky.fire.domain.DemLawSituation;
+import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.fire.domain.DemVehicle;
 import com.usky.fire.mapper.DemVehicleMapper;
 import com.usky.fire.service.DemVehicleService;
-import com.usky.common.mybatis.core.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -30,23 +29,23 @@ import java.util.Map;
 public class DemVehicleServiceImpl extends AbstractCrudService<DemVehicleMapper, DemVehicle> implements DemVehicleService {
 
     @Override
-    public CommonPage<Object> vehicleList(String vehicleCode, String vehicleAbbreviat, Integer id, Integer pageNum, Integer pageSize){
+    public CommonPage<Object> vehicleList(String vehicleCode, String vehicleAbbreviat, Integer id, Integer pageNum, Integer pageSize) {
         List<Object> list = new ArrayList<>();
         IPage<DemVehicle> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<DemVehicle> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.select(DemVehicle::getId,DemVehicle::getVehicleCode,DemVehicle::getVehicleAbbreviat,
-                DemVehicle::getRadioChannel,DemVehicle::getRadioCallSign,DemVehicle::getFireOrga,
-                DemVehicle::getVehicleClassCode,DemVehicle::getLicensePlate,DemVehicle::getAssetCode,
-                DemVehicle::getEquipTime, DemVehicle::getFireFightStatus,DemVehicle::getRecordStatus,
-                DemVehicle::getPoliceListCode,DemVehicle::getCommanderName,DemVehicle::getReporter,
-                DemVehicle::getDriver,DemVehicle::getSoldier,DemVehicle::getTypeCode,
+        queryWrapper.select(DemVehicle::getId, DemVehicle::getVehicleCode, DemVehicle::getVehicleAbbreviat,
+                DemVehicle::getRadioChannel, DemVehicle::getRadioCallSign, DemVehicle::getFireOrga,
+                DemVehicle::getVehicleClassCode, DemVehicle::getLicensePlate, DemVehicle::getAssetCode,
+                DemVehicle::getEquipTime, DemVehicle::getFireFightStatus, DemVehicle::getRecordStatus,
+                DemVehicle::getPoliceListCode, DemVehicle::getCommanderName, DemVehicle::getReporter,
+                DemVehicle::getDriver, DemVehicle::getSoldier, DemVehicle::getTypeCode,
                 DemVehicle::getVehicleStatus)
                 .eq(DemVehicle::getDeleteFlag, 0)
-                .like(StringUtils.isNotBlank(vehicleAbbreviat),DemVehicle::getVehicleAbbreviat,vehicleAbbreviat)
-                .like(StringUtils.isNotBlank(vehicleCode),DemVehicle::getVehicleCode,vehicleCode)
-                .eq(id!=null&&id!=0,DemVehicle::getId,id)
+                .like(StringUtils.isNotBlank(vehicleAbbreviat), DemVehicle::getVehicleAbbreviat, vehicleAbbreviat)
+                .like(StringUtils.isNotBlank(vehicleCode), DemVehicle::getVehicleCode, vehicleCode)
+                .eq(id != null && id != 0, DemVehicle::getId, id)
                 .orderByDesc(DemVehicle::getId);
-        page=this.page(page, queryWrapper);
+        page = this.page(page, queryWrapper);
         for (int i = 0; i < page.getRecords().size(); i++) {
             Map<String, Object> map = new HashMap<>();
             map.put("id", page.getRecords().get(i).getId());
@@ -74,7 +73,7 @@ public class DemVehicleServiceImpl extends AbstractCrudService<DemVehicleMapper,
     }
 
     @Override
-    public void updateVehicle(DemVehicle demVehicle){
+    public void updateVehicle(DemVehicle demVehicle) {
         this.updateById(demVehicle);
     }
 
@@ -86,4 +85,13 @@ public class DemVehicleServiceImpl extends AbstractCrudService<DemVehicleMapper,
         this.updateById(demVehicle);
     }
 
+    @Override
+    public List<DemVehicle> vehicleList(List<String> vehicleIdList) {
+        LambdaQueryWrapper<DemVehicle> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemVehicle::getRadioCallSign, DemVehicle::getVehicleId, DemVehicle::getLicensePlate)
+                .in(DemVehicle::getVehicleId, vehicleIdList);
+        List<DemVehicle> list = this.list(queryWrapper);
+        return list;
+    }
+
 }