更改数字公路搜索条件结果

src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/controller/EmergencyMaterialController.java

@@ -9,6 +9,8 @@ import com.elephant.framework.galaxy.aroad.response.R;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
+
 
 /**
  * 应急处置物资
@@ -34,6 +36,13 @@ public class EmergencyMaterialController extends BaseController {
     public R getEmergencyMaterialPage(Page page, String text) {
         return new R<>(emergencyMaterialService.getEmergencyMaterialPage(page, text));
     }
+    /**
+     * 查询所有物资经纬度信息
+     */
+    @GetMapping("/getlnglat")
+    public R getEmergencyMaterialLngLat(){
+        return new R<>(emergencyMaterialService.getLngLat());
+    }
 
     /**
      * @Description: 获取队伍车辆坐标信息
@@ -105,5 +114,11 @@ public class EmergencyMaterialController extends BaseController {
     public R removeById(@PathVariable Integer rowId) {
         return new R<>(emergencyMaterialService.removeById(rowId));
     }
-
+    /**
+     * 通过ID查询应急物资集
+     */
+    @GetMapping("/getbyids")
+    public R getByIds(@RequestParam("ids") String ids){
+        return new R<>(emergencyMaterialService.getByIds(Arrays.asList(ids.split(","))));
+    }
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/mapper/EmergencyMaterialMapper.java

@@ -7,8 +7,10 @@ import com.elephant.framework.galaxy.aroad.module.emergency.dto.MaterialCoordina
 import com.elephant.framework.galaxy.aroad.module.emergency.dto.TeamEquipmentInfoDto;
 import com.elephant.framework.galaxy.aroad.module.emergency.entity.EmergencyMaterial;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 应急处置物资
@@ -21,4 +23,6 @@ public interface EmergencyMaterialMapper extends BaseMapper<EmergencyMaterial> {
 
     List<MaterialCoordinateDto> getCoordinates(@Param("teamids") List<String> teamIdList);
     List<TeamEquipmentInfoDto> getTeams();
+    @Select("SELECT row_id,longitude,latitude FROM emergency_material where longitude IS NOT NULL AND latitude IS NOT NULL")
+    List<Map<String,Object>> queryLngLat();
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/EmergencyMaterialService.java

@@ -8,6 +8,7 @@ import com.elephant.framework.galaxy.aroad.module.emergency.dto.TeamEquipmentInf
 import com.elephant.framework.galaxy.aroad.module.emergency.entity.EmergencyMaterial;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 应急处置物资
@@ -34,4 +35,14 @@ public interface EmergencyMaterialService extends IService<EmergencyMaterial> {
      * @Date: 2019-04-15 10:09:57
      */
     List<TeamEquipmentInfoDto> getTeams();
+    /**
+     * @Description: 应急资源全部经纬度
+     * @Author: xuyanqi
+     * @Date: 2019-5-8 09：10
+     */
+    List<Map<String,Object>> getLngLat();
+    /**
+     * 根据多ID查询列表
+     */
+    List<EmergencyMaterial> getByIds(List<String> idList);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/impl/EmergencyMaterialServiceImpl.java

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 应急处置物资
@@ -50,4 +51,20 @@ public class EmergencyMaterialServiceImpl extends ServiceImpl<EmergencyMaterialM
     public List<TeamEquipmentInfoDto> getTeams() {
         return baseMapper.getTeams();
     }
+
+    @Override
+    /**
+     * @Description: 应急资源全部经纬度
+     * @Author: xuyanqi
+     * @Date: 2019-5-8 09：10
+     */
+    public List<Map<String,Object>> getLngLat(){
+        return baseMapper.queryLngLat();
+    }
+
+    @Override
+    public List<EmergencyMaterial> getByIds(List<String> idList) {
+        return baseMapper.selectBatchIds(idList);
+    }
+
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/szgl/controller/SzglController.java

@@ -20,36 +20,72 @@ public class SzglController {
     @GetMapping("/bigdata")
     public R getBigData(@RequestParam("keyword") String keyword) throws Exception {
         List<Map<String,Object>> responseList = new ArrayList<>();
-        //查询匹配桥梁名称
-        Boolean bridgeOne = EsUtil_fanshe.queryBridgeOne(keyword, "basicbridgedata", "2018", 0, 2000000000);
-        if(bridgeOne){
+//        //查询匹配桥梁名称
+//        Boolean bridgeOne = EsUtil_fanshe.queryBridgeOne(keyword, "basicbridgedata", "2018", 0, 2000000000);
+//        if(bridgeOne){
+//            responseList.add(new HashMap<String,Object>(){{
+//                put("label","桥梁");
+//                put("name","qiaoliang");
+//            }});
+//        }
+//        //查询匹配路段名称
+//        Boolean highWayOne = EsUtil_fanshe.queryHighWayOne(keyword ,"basichighwaydata", "2018", 0, 2000000000);
+//        if(highWayOne){
+//            responseList.add(new HashMap<String,Object>(){{
+//                put("label","路段");
+//                put("name","luduan");
+//            }});
+//        }
+//        //查询匹配隧道名称
+//        Boolean tunnelOne = EsUtil_fanshe.queryTunnelOne(keyword, "basictunneldata", "2018", 0, 2000000000);
+//        if(tunnelOne){
+//            responseList.add(new HashMap<String,Object>(){{
+//                put("label","隧道");
+//                put("name","suidao");
+//            }});
+//        }
+//        //查询匹配收费站名称
+//        Boolean baseRoadTollOne = EsUtil_fanshe.queryBaseRoadTollOne(keyword, "baseroadtolldata", "2018", 0, 2000000000);
+//        if(baseRoadTollOne){
+//            responseList.add(new HashMap<String,Object>(){{
+//                put("label","收费站");
+//                put("name","shoufeizhan");
+//            }});
+//        }
+        // 桥梁
+        ArrayList<LuKeBridge> luKeBridges = EsUtil_fanshe.queryBridge(keyword, "basicbridgedata", "2018", 0, 2000000000);
+        for(LuKeBridge lnKeBridge : luKeBridges){
             responseList.add(new HashMap<String,Object>(){{
-                put("label","桥梁");
-                put("name","qiaoliang");
+                put("name",lnKeBridge.getQiaoliangmingcheng());
+                put("iden","qiaoliang");
+                put("data", lnKeBridge);
             }});
         }
-        //查询匹配路段名称
-        Boolean highWayOne = EsUtil_fanshe.queryHighWayOne(keyword ,"basichighwaydata", "2018", 0, 2000000000);
-        if(highWayOne){
+        // 路线
+        ArrayList<Basehighwayalldata> lukehighways = EsUtil_fanshe.queryHighWay(keyword, "basichighwaydata", "2018", 0, 2000000000);
+        for(Basehighwayalldata basehighwayalldata : lukehighways){
             responseList.add(new HashMap<String,Object>(){{
-                put("label","路段");
-                put("name","luduan");
+                put("name",basehighwayalldata.getLuxianmingcheng());
+                put("iden","luxian");
+                put("data", basehighwayalldata);
             }});
         }
-        //查询匹配隧道名称
-        Boolean tunnelOne = EsUtil_fanshe.queryTunnelOne(keyword, "basictunneldata", "2018", 0, 2000000000);
-        if(tunnelOne){
+        // 隧道
+        ArrayList<BasicTunnel> basicTunnels = EsUtil_fanshe.queryTunnel("广州桥", "basictunneldata", "2018", 0, 2000000000);
+        for(BasicTunnel basicTunnel : basicTunnels){
             responseList.add(new HashMap<String,Object>(){{
-                put("label","隧道");
-                put("name","suidao");
+                put("name",basicTunnel.getSuidaomingcheng());
+                put("iden","suidao");
+                put("data", basicTunnel);
             }});
         }
-        //查询匹配收费站名称
-        Boolean baseRoadTollOne = EsUtil_fanshe.queryBaseRoadTollOne(keyword, "baseroadtolldata", "2018", 0, 2000000000);
-        if(baseRoadTollOne){
+        // 收费站
+        ArrayList<BaseRoadToll_String> baseRoadTollStrings = EsUtil_fanshe.queryBaseRoadTollString(keyword, "baseroadtolldata", "2018", 0, 2000000000);
+        for(BaseRoadToll_String baseRoadToll_String : baseRoadTollStrings){
             responseList.add(new HashMap<String,Object>(){{
-                put("label","收费站");
-                put("name","shoufeizhan");
+                put("name",baseRoadToll_String.getShortName());
+                put("iden","shoufeizhan");
+                put("data", baseRoadToll_String);
             }});
         }
         return new R<>(responseList);