高层公共建筑及消防站撒点

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

@@ -33,11 +33,13 @@ public class DemFireStationController {
      * 消防站-撒点
      *
      * @param id  主键ID
+     * @param streetTown  所属街镇
      * @return
      */
     @GetMapping("demFireStationList")
-    public ApiResult<List<DemFireStation>> demFireStationList(@RequestParam(value = "id", required = false) Integer id) {
-        return ApiResult.success(demFireStationService.demFireStationList(id));
+    public ApiResult<List<DemFireStation>> demFireStationList(@RequestParam(value = "id", required = false) Integer id,
+                                                              @RequestParam(value = "streetTown", required = false) String streetTown) {
+        return ApiResult.success(demFireStationService.demFireStationList(id,streetTown));
     }
 }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/DemFireStation.java

@@ -51,5 +51,10 @@ public class DemFireStation implements Serializable {
      */
     private String latitude;
 
+    /**
+     * 所属街镇
+     */
+    private String streetTown;
+
 
 }

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

@@ -21,5 +21,5 @@ public interface DemFireStationService extends CrudService<DemFireStation> {
      * @param id  主键ID
      * @return
      */
-    List<DemFireStation> demFireStationList(Integer id);
+    List<DemFireStation> demFireStationList(Integer id,String streetTown);
 }

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

@@ -1,6 +1,7 @@
 package com.usky.fire.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.fire.domain.DemFireStation;
 import com.usky.fire.domain.DemHighRise;
@@ -22,8 +23,9 @@ import java.util.List;
 @Service
 public class DemFireStationServiceImpl extends AbstractCrudService<DemFireStationMapper, DemFireStation> implements DemFireStationService {
     @Override
-    public List<DemFireStation> demFireStationList(Integer id) {
+    public List<DemFireStation> demFireStationList(Integer id,String streetTown) {
         LambdaQueryWrapper<DemFireStation> query = Wrappers.lambdaQuery();
+        query.eq(StringUtils.isNotBlank(streetTown),DemFireStation::getStreetTown, streetTown);
         List<DemFireStation> list = this.list(query);
         return list;
     }

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemFireStationMapper.xml

@@ -10,6 +10,7 @@
         <result column="station_type" property="stationType" />
         <result column="longitude" property="longitude" />
         <result column="latitude" property="latitude" />
+        <result column="street_town" property="streetTown" />
     </resultMap>
 
 </mapper>