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_report_grade");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("dem_fire_station");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

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

@@ -0,0 +1,45 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 消防站 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-31
+ */
+@RestController
+@RequestMapping("/demFireStation")
+public class DemFireStationController {
+    @Autowired
+    private DemFireStationService demFireStationService;
+    /**
+     * 消防站-撒点
+     *
+     * @param id  主键ID
+     * @param streetTown  所属街镇
+     * @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));
+    }
+}
+

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

@@ -0,0 +1,41 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.fire.domain.DemHighRise;
+import com.usky.fire.service.DemHighRiseService;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 高层公共建筑底数 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-31
+ */
+@RestController
+@RequestMapping("/demHighRise")
+public class DemHighRiseController {
+
+    @Autowired
+    private DemHighRiseService demHighRiseService;
+    /**
+     * 高层公共建筑-撒点
+     *
+     * @param id  主键ID
+     * @return
+     */
+    @GetMapping("demHighRiseList")
+    public ApiResult<List<DemHighRise>> demHighRiseList(@RequestParam(value = "id", required = false) Integer id) {
+        return ApiResult.success(demHighRiseService.demHighRiseList(id));
+    }
+}
+

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

@@ -0,0 +1,60 @@
+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-03-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemFireStation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 消防站名称
+     */
+    private String stationName;
+
+    /**
+     * 消防站地址
+     */
+    private String stationAddress;
+
+    /**
+     * 消防站类型;1、一类消防站 2、二类消防站 3、小型消防站
+     */
+    private Integer stationType;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 所属街镇
+     */
+    private String streetTown;
+
+
+}

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

@@ -0,0 +1,275 @@
+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-03-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemHighRise implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 当前待办人员
+     */
+    private String toDoPtersonnel;
+
+    /**
+     * 建筑名称
+     */
+    private String buildName;
+
+    /**
+     * 建筑物二级名称
+     */
+    private String buildSecondaryName;
+
+    /**
+     * 建筑物地址
+     */
+    private String address;
+
+    /**
+     * 是否多产权建筑;0、否 1、是
+     */
+    private Integer manyOwnership;
+
+    /**
+     * 房产证数量(本)
+     */
+    private String birthCert;
+
+    /**
+     * 主要产权人（单位、自然人）名称
+     */
+    private String principalPropertyOwner;
+
+    /**
+     * 统一社会信用代码（自然人此项不填）
+     */
+    private String creditCode;
+
+    /**
+     * 是否聘请物业服务企业进行管理;0、否 1、是
+     */
+    private Integer propertyService;
+
+    /**
+     * 聘用物业家数
+     */
+    private Integer propertyNum;
+
+    /**
+     * 物业服务企业名称
+     */
+    private String propertyServiceName;
+
+    /**
+     * 物业统一社会信用代码
+     */
+    private String propertyCreditCode;
+
+    /**
+     * 单位座机号码
+     */
+    private String lpropertyAndlineNum;
+
+    /**
+     * 项目负责人姓名
+     */
+    private String propertyProjectLeader;
+
+    /**
+     * 项目负责人手机号码
+     */
+    private String propertyLeaderPhone;
+
+    /**
+     * 是否聘请消防技术服务机构开展建筑消防设施维护
+     */
+    private Integer fireServiceMaintain;
+
+    /**
+     * 聘用家数
+     */
+    private Integer maintainNum;
+
+    /**
+     * 消防技术服务机构名称
+     */
+    private String maintainName;
+
+    /**
+     * 统一社会信用代码
+     */
+    private String maintainCreditCode;
+
+    /**
+     * 项目负责人姓名
+     */
+    private String maintainProjectLeader;
+
+    /**
+     * 项目负责人手机号码
+     */
+    private String maintainLeaderPhone;
+
+    /**
+     * 是否聘请消防技术服务机构开展建筑消防设施检测
+     */
+    private Integer fireServiceCheck;
+
+    /**
+     * 聘用家数
+     */
+    private Integer checkNum;
+
+    /**
+     * 消防技术服务机构名称
+     */
+    private String checkName;
+
+    /**
+     * 统一社会信用代码
+     */
+    private String checkCreditCode;
+
+    /**
+     * 项目负责人姓名
+     */
+    private String checkProjectLeader;
+
+    /**
+     * 项目负责人手机号码
+     */
+    private String checkLeaderPhone;
+
+    /**
+     * 是否聘请消防技术服务机构开展消防安全评估
+     */
+    private Integer fireServiceEstimate;
+
+    /**
+     * 聘用家数
+     */
+    private Integer estimateNum;
+
+    /**
+     * 消防技术服务机构名称
+     */
+    private String estimateName;
+
+    /**
+     * 统一社会信用代码
+     */
+    private String estimateCreditCode;
+
+    /**
+     * 项目负责人姓名
+     */
+    private String estimateProjectLeader;
+
+    /**
+     * 项目负责人手机号码
+     */
+    private String estimateLeaderPhone;
+
+    /**
+     * 是否设有消防控制室
+     */
+    private Integer controlRoom;
+
+    /**
+     * 消防控制室位置
+     */
+    private String controlRoomAddress;
+
+    /**
+     * 消防控制室持证上岗人数
+     */
+    private String certificateNum;
+
+    /**
+     * 消防水泵房位置
+     */
+    private String pumpRoomAddress;
+
+    /**
+     * 水泵结合器位置
+     */
+    private String combinerAddress;
+
+    /**
+     * 建筑高度
+     */
+    private String buildHigh;
+
+    /**
+     * 建成年代
+     */
+    private String completeYear;
+
+    /**
+     * 地下建筑层数
+     */
+    private String underFloor;
+
+    /**
+     * 地上建筑层数
+     */
+    private String aboveFloor;
+
+    /**
+     * 建筑类型
+     */
+    private String buildType;
+
+    /**
+     * 不动产证登记用途
+     */
+    private String birthCertRegister;
+
+    /**
+     * 不动产证中“规划用途”栏或附记栏中记载的用途为
+     */
+    private String birthCertUse;
+
+    /**
+     * 功能用途
+     */
+    private String functionalPurpose;
+
+    /**
+     * 其他（文字描述）
+     */
+    private String otherDesc;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemFireStation;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 消防站 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-31
+ */
+public interface DemFireStationMapper extends CrudMapper<DemFireStation> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemHighRise;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 高层公共建筑底数 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-31
+ */
+public interface DemHighRiseMapper extends CrudMapper<DemHighRise> {
+
+}

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

@@ -0,0 +1,25 @@
+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 java.util.List;
+
+/**
+ * <p>
+ * 消防站 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-31
+ */
+public interface DemFireStationService extends CrudService<DemFireStation> {
+    /**
+     * 消防站-撒点
+     *
+     * @param id  主键ID
+     * @return
+     */
+    List<DemFireStation> demFireStationList(Integer id,String streetTown);
+}

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

@@ -0,0 +1,24 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.DemHighRise;
+import com.usky.common.mybatis.core.CrudService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 高层公共建筑底数 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-31
+ */
+public interface DemHighRiseService extends CrudService<DemHighRise> {
+    /**
+     * 高层公共建筑-撒点
+     *
+     * @param id  主键ID
+     * @return
+     */
+    List<DemHighRise> demHighRiseList(Integer id);
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemFireStationServiceImpl.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.DemFireStation;
+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 org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 消防站 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-31
+ */
+@Service
+public class DemFireStationServiceImpl extends AbstractCrudService<DemFireStationMapper, DemFireStation> implements DemFireStationService {
+    @Override
+    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/java/com/usky/fire/service/impl/DemHighRiseServiceImpl.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.Wrappers;
+import com.usky.fire.domain.DemHighRise;
+import com.usky.fire.mapper.DemHighRiseMapper;
+import com.usky.fire.service.DemHighRiseService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 高层公共建筑底数 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-03-31
+ */
+@Service
+public class DemHighRiseServiceImpl extends AbstractCrudService<DemHighRiseMapper, DemHighRise> implements DemHighRiseService {
+    @Override
+    public List<DemHighRise> demHighRiseList(Integer id) {
+        LambdaQueryWrapper<DemHighRise> query = Wrappers.lambdaQuery();
+        if (id != 0){
+            query.eq(DemHighRise::getId, id);
+        }
+        List<DemHighRise> list = this.list(query);
+        return list;
+    }
+}

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

@@ -0,0 +1,16 @@
+<?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.DemFireStationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemFireStation">
+        <id column="id" property="id" />
+        <result column="station_name" property="stationName" />
+        <result column="station_address" property="stationAddress" />
+        <result column="station_type" property="stationType" />
+        <result column="longitude" property="longitude" />
+        <result column="latitude" property="latitude" />
+        <result column="street_town" property="streetTown" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,59 @@
+<?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.DemHighRiseMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemHighRise">
+        <id column="id" property="id" />
+        <result column="to_do_ptersonnel" property="toDoPtersonnel" />
+        <result column="build_name" property="buildName" />
+        <result column="build_secondary_name" property="buildSecondaryName" />
+        <result column="address" property="address" />
+        <result column="many_ownership" property="manyOwnership" />
+        <result column="birth_cert" property="birthCert" />
+        <result column="principal_property_owner" property="principalPropertyOwner" />
+        <result column="credit_code" property="creditCode" />
+        <result column="property_service" property="propertyService" />
+        <result column="property_num" property="propertyNum" />
+        <result column="property_service_name" property="propertyServiceName" />
+        <result column="property_credit_code" property="propertyCreditCode" />
+        <result column="lproperty_andline_num" property="lpropertyAndlineNum" />
+        <result column="property_project_leader" property="propertyProjectLeader" />
+        <result column="property_leader_phone" property="propertyLeaderPhone" />
+        <result column="fire_service_maintain" property="fireServiceMaintain" />
+        <result column="maintain_num" property="maintainNum" />
+        <result column="maintain_name" property="maintainName" />
+        <result column="maintain_credit_code" property="maintainCreditCode" />
+        <result column="maintain_project_leader" property="maintainProjectLeader" />
+        <result column="maintain_leader_phone" property="maintainLeaderPhone" />
+        <result column="fire_service_check" property="fireServiceCheck" />
+        <result column="check_num" property="checkNum" />
+        <result column="check_name" property="checkName" />
+        <result column="check_credit_code" property="checkCreditCode" />
+        <result column="check_project_leader" property="checkProjectLeader" />
+        <result column="check_leader_phone" property="checkLeaderPhone" />
+        <result column="fire_service_estimate" property="fireServiceEstimate" />
+        <result column="estimate_num" property="estimateNum" />
+        <result column="estimate_name" property="estimateName" />
+        <result column="estimate_credit_code" property="estimateCreditCode" />
+        <result column="estimate_project_leader" property="estimateProjectLeader" />
+        <result column="estimate_leader_phone" property="estimateLeaderPhone" />
+        <result column="control_room" property="controlRoom" />
+        <result column="control_room_address" property="controlRoomAddress" />
+        <result column="certificate_num" property="certificateNum" />
+        <result column="pump_room_address" property="pumpRoomAddress" />
+        <result column="combiner_address" property="combinerAddress" />
+        <result column="build_high" property="buildHigh" />
+        <result column="complete_year" property="completeYear" />
+        <result column="under_floor" property="underFloor" />
+        <result column="above_floor" property="aboveFloor" />
+        <result column="build_type" property="buildType" />
+        <result column="birth_cert_register" property="birthCertRegister" />
+        <result column="birth_cert_use" property="birthCertUse" />
+        <result column="functional_purpose" property="functionalPurpose" />
+        <result column="other_desc" property="otherDesc" />
+        <result column="longitude" property="longitude" />
+        <result column="latitude" property="latitude" />
+    </resultMap>
+
+</mapper>