Merge branch 'han' of uskycloud/usky-modules into master

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

@@ -71,7 +71,7 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude("dem_fire_station");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("dem_street_micro_station");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

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

@@ -6,13 +6,11 @@ import com.usky.fire.domain.DemFireStation;
 import com.usky.fire.domain.DemHighRise;
 import com.usky.fire.service.DemFireStationService;
 import com.usky.fire.service.DemHighRiseService;
+import com.usky.fire.service.vo.DemFireStationVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -32,14 +30,12 @@ public class DemFireStationController {
     /**
      * 消防站-撒点
      *
-     * @param id  主键ID
-     * @param streetTown  所属街镇
+     * @param demFireStationVO
      * @return
      */
-    @GetMapping("demFireStationList")
-    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));
+    @PostMapping("demFireStationList")
+    public ApiResult<List<DemFireStation>> demFireStationList(@RequestBody DemFireStationVO demFireStationVO) {
+        return ApiResult.success(demFireStationService.demFireStationList(demFireStationVO));
     }
 }
 

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

@@ -0,0 +1,37 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.fire.domain.DemStreetMicroStation;
+import com.usky.fire.service.DemStreetMicroStationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 街镇微型消防站 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-04-06
+ */
+@RestController
+@RequestMapping("/demStreetMicroStation")
+public class DemStreetMicroStationController {
+    @Autowired
+    private DemStreetMicroStationService demStreetMicroStationService;
+
+    /**
+     * 街镇微型消防站-撒点
+     *
+     * @param streetTown
+     * @return
+     */
+    @GetMapping("demStreetMicroStationList")
+    public ApiResult<List<DemStreetMicroStation>> demStreetMicroStationList(@RequestParam(value = "streetTown", required = false) String streetTown) {
+        return ApiResult.success(demStreetMicroStationService.demStreetMicroStationList(streetTown));
+    }
+}
+

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

@@ -0,0 +1,100 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 街镇微型消防站
+ * </p>
+ *
+ * @author han
+ * @since 2023-04-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemStreetMicroStation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 所属街镇
+     */
+    private String streetTown;
+
+    /**
+     * 编号
+     */
+    private Integer stationCode;
+
+    /**
+     * 消防站地址
+     */
+    private String stationAddress;
+
+    /**
+     * 距消防站直线距离
+     */
+    private String linearDistance;
+
+    /**
+     * 距消防站行驶距离
+     */
+    private String driveDistance;
+
+    /**
+     * 交通拥堵行驶时间
+     */
+    private String jamDrive;
+
+    /**
+     * 交通畅通行驶时间
+     */
+    private String unimpededDrive;
+
+    /**
+     * 点位情况
+     */
+    private String pointSituation;
+
+    /**
+     * 建筑情况
+     */
+    private String buildSituation;
+
+    /**
+     * 车辆停放
+     */
+    private String vehiclePark;
+
+    /**
+     * 是否有产证
+     */
+    private String birthCert;
+
+    /**
+     * 产证情况
+     */
+    private String birthCertSituation;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/DemStreetMicroStationMapper.java

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemStreetMicroStation;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 街镇微型消防站 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-04-06
+ */
+public interface DemStreetMicroStationMapper extends CrudMapper<DemStreetMicroStation> {
+
+}

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

@@ -3,6 +3,7 @@ package com.usky.fire.service;
 import com.usky.fire.domain.DemFireStation;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.DemHighRise;
+import com.usky.fire.service.vo.DemFireStationVO;
 
 import java.util.List;
 
@@ -18,8 +19,8 @@ public interface DemFireStationService extends CrudService<DemFireStation> {
     /**
      * 消防站-撒点
      *
-     * @param id  主键ID
+     * @param demFireStationVO  主键ID
      * @return
      */
-    List<DemFireStation> demFireStationList(Integer id,String streetTown);
+    List<DemFireStation> demFireStationList(DemFireStationVO demFireStationVO);
 }

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

@@ -0,0 +1,25 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.DemHighRise;
+import com.usky.fire.domain.DemStreetMicroStation;
+import com.usky.common.mybatis.core.CrudService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 街镇微型消防站 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-04-06
+ */
+public interface DemStreetMicroStationService extends CrudService<DemStreetMicroStation> {
+    /**
+     * 街镇微型消防站-撒点
+     *
+     * @param streetTown
+     * @return
+     */
+    List<DemStreetMicroStation> demStreetMicroStationList(String streetTown);
+}

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

@@ -8,6 +8,7 @@ import com.usky.fire.domain.DemHighRise;
 import com.usky.fire.mapper.DemFireStationMapper;
 import com.usky.fire.service.DemFireStationService;
 import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.fire.service.vo.DemFireStationVO;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -23,9 +24,10 @@ import java.util.List;
 @Service
 public class DemFireStationServiceImpl extends AbstractCrudService<DemFireStationMapper, DemFireStation> implements DemFireStationService {
     @Override
-    public List<DemFireStation> demFireStationList(Integer id,String streetTown) {
+    public List<DemFireStation> demFireStationList(DemFireStationVO demFireStationVO) {
         LambdaQueryWrapper<DemFireStation> query = Wrappers.lambdaQuery();
-        query.eq(StringUtils.isNotBlank(streetTown),DemFireStation::getStreetTown, streetTown);
+        query.eq(StringUtils.isNotBlank(demFireStationVO.getStreetTown()),DemFireStation::getStreetTown, demFireStationVO.getStreetTown());
+        query.in(DemFireStation::getStationType, demFireStationVO.getStationType());
         List<DemFireStation> list = this.list(query);
         return list;
     }

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

@@ -0,0 +1,32 @@
+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.DemHighRise;
+import com.usky.fire.domain.DemStreetMicroStation;
+import com.usky.fire.mapper.DemStreetMicroStationMapper;
+import com.usky.fire.service.DemStreetMicroStationService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 街镇微型消防站 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-04-06
+ */
+@Service
+public class DemStreetMicroStationServiceImpl extends AbstractCrudService<DemStreetMicroStationMapper, DemStreetMicroStation> implements DemStreetMicroStationService {
+    @Override
+    public List<DemStreetMicroStation> demStreetMicroStationList(String streetTown) {
+        LambdaQueryWrapper<DemStreetMicroStation> query = Wrappers.lambdaQuery();
+        query.eq(StringUtils.isNotBlank(streetTown),DemStreetMicroStation::getStreetTown, streetTown);
+        List<DemStreetMicroStation> list = this.list(query);
+        return list;
+    }
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DemFireStationVO.java

@@ -0,0 +1,28 @@
+package com.usky.fire.service.vo;
+
+import com.usky.fire.domain.BaseBuild;
+import com.usky.fire.domain.BaseCompany;
+import com.usky.fire.domain.BaseCompanyAttach1;
+import com.usky.fire.domain.BaseCompanyPerson;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author han
+ * @since 2023-04-06
+ */
+@Data
+public class DemFireStationVO {
+
+        private Integer id;
+
+        private String streetTown;
+
+        private List<Integer> stationType;
+
+}

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.fire.mapper.DemStreetMicroStationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemStreetMicroStation">
+        <id column="id" property="id" />
+        <result column="street_town" property="streetTown" />
+        <result column="station_code" property="stationCode" />
+        <result column="station_address" property="stationAddress" />
+        <result column="linear_distance" property="linearDistance" />
+        <result column="drive_distance" property="driveDistance" />
+        <result column="jam_drive" property="jamDrive" />
+        <result column="unimpeded_drive" property="unimpededDrive" />
+        <result column="point_situation" property="pointSituation" />
+        <result column="build_situation" property="buildSituation" />
+        <result column="vehicle_park" property="vehiclePark" />
+        <result column="birth_cert" property="birthCert" />
+        <result column="birth_cert_situation" property="birthCertSituation" />
+        <result column="longitude" property="longitude" />
+        <result column="latitude" property="latitude" />
+    </resultMap>
+
+</mapper>