From feafd4d4f00f28c600400ec16423f5f6c2b1dd92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LI-CCONG=5C=E6=9D=8E=E8=81=AA=E8=81=AA?= <1441652193@qq.com> Date: Mon, 18 Mar 2024 16:53:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E4=BF=A1=E6=81=AF=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/HousingEstateController.java | 87 +++++++++++++++++++ .../controller/RecycleOrderController.java | 2 +- .../cc/yunxi/domain/po/HousingEstate.java | 85 ++++++++++++++++++ .../vo/housingestate/HousingEstateRespVO.java | 62 +++++++++++++ .../cc/yunxi/mapper/HousingEstateMapper.java | 29 +++++++ .../yunxi/service/IHousingEstateService.java | 36 ++++++++ .../impl/HousingEstateServiceImpl.java | 50 +++++++++++ .../resources/mapper/HousingEstateMapper.xml | 25 ++++++ 8 files changed, 375 insertions(+), 1 deletion(-) create mode 100644 nxhs-service/src/main/java/cc/yunxi/controller/HousingEstateController.java create mode 100644 nxhs-service/src/main/java/cc/yunxi/domain/po/HousingEstate.java create mode 100644 nxhs-service/src/main/java/cc/yunxi/domain/vo/housingestate/HousingEstateRespVO.java create mode 100644 nxhs-service/src/main/java/cc/yunxi/mapper/HousingEstateMapper.java create mode 100644 nxhs-service/src/main/java/cc/yunxi/service/IHousingEstateService.java create mode 100644 nxhs-service/src/main/java/cc/yunxi/service/impl/HousingEstateServiceImpl.java create mode 100644 nxhs-service/src/main/resources/mapper/HousingEstateMapper.xml diff --git a/nxhs-service/src/main/java/cc/yunxi/controller/HousingEstateController.java b/nxhs-service/src/main/java/cc/yunxi/controller/HousingEstateController.java new file mode 100644 index 0000000..013179d --- /dev/null +++ b/nxhs-service/src/main/java/cc/yunxi/controller/HousingEstateController.java @@ -0,0 +1,87 @@ +package cc.yunxi.controller; + + +import cc.yunxi.common.domain.CommonResult; +import cc.yunxi.common.utils.BeanUtils; +import cc.yunxi.common.utils.CommonUtil; +import cc.yunxi.domain.dto.LocationDTO; +import cc.yunxi.domain.po.HousingEstate; +import cc.yunxi.domain.vo.housingestate.HousingEstateRespVO; +import cc.yunxi.domain.vo.recycleorder.RecycleOrderRespVO; +import cc.yunxi.service.IHousingEstateService; +import cn.hutool.core.util.ObjectUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.math.BigDecimal; +import java.util.List; + +/** + *
+ * 小区信息表 前端控制器 + *
+ * + * @author ccongli + * @since 2024-03-18 02:31:50 + */ +@Api(tags = "小区接口") +@RestController +@RequestMapping("/housing-estate") +@RequiredArgsConstructor +@Slf4j +@Validated +public class HousingEstateController { + + + @Resource + private IHousingEstateService housingEstateService; + + @ApiOperation("附近两个小区") + @GetMapping("/nearby") + public CommonResult+ * 小区信息表 + *
+ * + * @author ccongli + * @since 2024-03-18 02:31:50 + */ +@Data +@TableName("nx_housing_estate") +@ApiModel(value = "HousingEstate", description = "小区信息表") +public class HousingEstate { + + @ApiModelProperty("主键id") + @TableId(value = "id", type = IdType.ASSIGN_ID) + private String id; + + @ApiModelProperty("小区名") + @TableField("name") + private String name; + + @ApiModelProperty("小区详细地址") + @TableField("address") + private String address; + + @ApiModelProperty("经度") + @TableField("longitude") + private String longitude; + + @ApiModelProperty("纬度") + @TableField("latitude") + private String latitude; + + @ApiModelProperty("是否支持定时定点回收 0 否 1 是") + @TableField("has_schedule") + private Integer hasSchedule; + + @ApiModelProperty("定点回收地址") + @TableField("recycle_address") + private String recycleAddress; + + @ApiModelProperty("定点回收时间起") + @TableField("appointment_time_start") + private String appointmentTimeStart; + + @ApiModelProperty("定点回收时间止") + @TableField("appointment_time_end") + private String appointmentTimeEnd; + + @ApiModelProperty("所属回收站id") + @TableField("station_id") + private String stationId; + +// @ApiModelProperty("有效标志(0-禁用,1-启用)") +// @TableField("enabled_mark") +// private Integer enabledMark; + + @ApiModelProperty("创建时间") + @TableField("f_creator_time") + private LocalDateTime creatorTime; + + @ApiModelProperty("备注") + @TableField("remark") + private String remark; + + @ApiModelProperty("小区距离(m)") + @TableField(exist = false) + private String distance; + +} diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/housingestate/HousingEstateRespVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/housingestate/HousingEstateRespVO.java new file mode 100644 index 0000000..a828904 --- /dev/null +++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/housingestate/HousingEstateRespVO.java @@ -0,0 +1,62 @@ +package cc.yunxi.domain.vo.housingestate; + +import cc.yunxi.domain.dto.LocationDTO; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + *+ * 小区信息表 + *
+ * + * @author ccongli + * @since 2024-03-18 02:31:50 + */ +@Data +@ApiModel(value = "HousingEstate", description = "小区信息 Response VO") +public class HousingEstateRespVO { + + @ApiModelProperty("主键id") + private String id; + + @ApiModelProperty("小区名") + private String name; + + @ApiModelProperty("小区详细地址") + private String address; + + @ApiModelProperty("位置信息") + private LocationDTO location; + + @ApiModelProperty("定点回收地址") + private String recycleAddress; + + @ApiModelProperty("定点回收时间起") + private String appointmentTimeStart; + + @ApiModelProperty("定点回收时间止") + private String appointmentTimeEnd; + + @ApiModelProperty("所属回收站id") + private String stationId; + +// @ApiModelProperty("有效标志(0-禁用,1-启用)") +// @TableField("enabled_mark") +// private Integer enabledMark; + + @ApiModelProperty("创建时间") + private LocalDateTime creatorTime; + + @ApiModelProperty("备注") + private String remark; + + + @ApiModelProperty("小区距离(km)") + private String distance; + +} diff --git a/nxhs-service/src/main/java/cc/yunxi/mapper/HousingEstateMapper.java b/nxhs-service/src/main/java/cc/yunxi/mapper/HousingEstateMapper.java new file mode 100644 index 0000000..0d96bdc --- /dev/null +++ b/nxhs-service/src/main/java/cc/yunxi/mapper/HousingEstateMapper.java @@ -0,0 +1,29 @@ +package cc.yunxi.mapper; + +import cc.yunxi.domain.dto.LocationDTO; +import cc.yunxi.domain.po.HousingEstate; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *+ * 小区信息表 Mapper 接口 + *
+ * + * @author ccongli + * @since 2024-03-18 02:31:50 + */ +@Mapper +public interface HousingEstateMapper extends BaseMapper+ * 小区信息表 服务类 + *
+ * + * @author ccongli + * @since 2024-03-18 02:31:50 + */ +public interface IHousingEstateService extends IService+ * 小区信息表 服务实现类 + *
+ * + * @author ccongli + * @since 2024-03-18 02:31:50 + */ +@Service +@Validated +public class HousingEstateServiceImpl extends ServiceImpl