From 5e36d651663b72b94e9b2d4a061416ad35ff15cf Mon Sep 17 00:00:00 2001 From: Guo YuKun <1458871005@qq.com> Date: Fri, 22 Mar 2024 19:05:59 +0800 Subject: [PATCH 01/10] 123 --- .idea/encodings.xml | 3 +- .idea/uiDesigner.xml | 124 ++++++++++++++++++ .../src/main/java/com/bwie/common/User.java | 18 +++ .../java/com/bwie/common/domain/AskBuy.java | 36 +++++ .../java/com/bwie/common/domain/AskRent.java | 33 +++++ .../bwie/background/BackgroundMapperApp.java | 15 +++ .../controller/BackGroundController.java | 17 +++ .../background/mapper/BackGroundMapper.java | 4 + .../background/seriver/BackGroundService.java | 4 + .../seriver/impl/BackGroundServiceImpl.java | 10 ++ .../src/main/resources/bootstrap.yml | 4 +- .../resources/mapper/BackGroundMapper.xml | 5 + bwie-modules/bwie-system/pom.xml | 10 +- .../com/bwie/system/mapper/SysMapper.java | 7 + 14 files changed, 285 insertions(+), 5 deletions(-) create mode 100644 .idea/uiDesigner.xml create mode 100644 bwie-common/src/main/java/com/bwie/common/User.java create mode 100644 bwie-common/src/main/java/com/bwie/common/domain/AskBuy.java create mode 100644 bwie-common/src/main/java/com/bwie/common/domain/AskRent.java create mode 100644 bwie-modules/bwie-background/src/main/java/com/bwie/background/BackgroundMapperApp.java create mode 100644 bwie-modules/bwie-background/src/main/java/com/bwie/background/controller/BackGroundController.java create mode 100644 bwie-modules/bwie-background/src/main/java/com/bwie/background/mapper/BackGroundMapper.java create mode 100644 bwie-modules/bwie-background/src/main/java/com/bwie/background/seriver/BackGroundService.java create mode 100644 bwie-modules/bwie-background/src/main/java/com/bwie/background/seriver/impl/BackGroundServiceImpl.java create mode 100644 bwie-modules/bwie-background/src/main/resources/mapper/BackGroundMapper.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml index b929e54..9c7a0a3 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -8,13 +8,14 @@ + + - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bwie-common/src/main/java/com/bwie/common/User.java b/bwie-common/src/main/java/com/bwie/common/User.java new file mode 100644 index 0000000..fe11686 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/User.java @@ -0,0 +1,18 @@ +package com.bwie.common; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class User { + + + private Integer userId; + private String userName; + private String userTel; +} diff --git a/bwie-common/src/main/java/com/bwie/common/domain/AskBuy.java b/bwie-common/src/main/java/com/bwie/common/domain/AskBuy.java new file mode 100644 index 0000000..38fa460 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/AskBuy.java @@ -0,0 +1,36 @@ +package com.bwie.common.domain; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigInteger; +import java.text.DecimalFormat; +import java.util.Date; + +/** + * 求购表 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class AskBuy { + + private BigInteger askbuyId; + private String askbuyAddress; + private String askbuyTitle; + private BigInteger dictionarytypeId; + private BigInteger addrId; + private BigInteger userId; + private DecimalFormat askbuyPrice; + private BigInteger isDelete; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date udpdateTime; +} diff --git a/bwie-common/src/main/java/com/bwie/common/domain/AskRent.java b/bwie-common/src/main/java/com/bwie/common/domain/AskRent.java new file mode 100644 index 0000000..2e72e32 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/AskRent.java @@ -0,0 +1,33 @@ +package com.bwie.common.domain; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; +import java.math.BigInteger; +import java.text.DecimalFormat; +import java.util.Date; +/** + * 求租表 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class AskRent { + private BigInteger askrentId; + private String askbuyAddress; + private String askbuyTitle; + private BigInteger dictionarytypeId; + private BigInteger addrId; + private BigInteger userId; + private DecimalFormat askbuyPrice; + private BigInteger isDelete; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date udpdateTime; +} diff --git a/bwie-modules/bwie-background/src/main/java/com/bwie/background/BackgroundMapperApp.java b/bwie-modules/bwie-background/src/main/java/com/bwie/background/BackgroundMapperApp.java new file mode 100644 index 0000000..64cc707 --- /dev/null +++ b/bwie-modules/bwie-background/src/main/java/com/bwie/background/BackgroundMapperApp.java @@ -0,0 +1,15 @@ +package com.bwie.background; + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; + +@SpringBootApplication +@EnableDiscoveryClient +@MapperScan("com.bwie.group.mapper") +public class BackgroundMapperApp { + public static void main(String[] args) { + SpringApplication.run(BackgroundMapperApp.class); + } +} diff --git a/bwie-modules/bwie-background/src/main/java/com/bwie/background/controller/BackGroundController.java b/bwie-modules/bwie-background/src/main/java/com/bwie/background/controller/BackGroundController.java new file mode 100644 index 0000000..a65df63 --- /dev/null +++ b/bwie-modules/bwie-background/src/main/java/com/bwie/background/controller/BackGroundController.java @@ -0,0 +1,17 @@ +package com.bwie.background.controller; + +import com.bwie.background.seriver.BackGroundService; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/back") +public class BackGroundController { + + + private final BackGroundService backGroundService; + + public BackGroundController(BackGroundService backGroundService) { + this.backGroundService = backGroundService; + } +} diff --git a/bwie-modules/bwie-background/src/main/java/com/bwie/background/mapper/BackGroundMapper.java b/bwie-modules/bwie-background/src/main/java/com/bwie/background/mapper/BackGroundMapper.java new file mode 100644 index 0000000..888c989 --- /dev/null +++ b/bwie-modules/bwie-background/src/main/java/com/bwie/background/mapper/BackGroundMapper.java @@ -0,0 +1,4 @@ +package com.bwie.background.mapper; + +public interface BackGroundMapper { +} diff --git a/bwie-modules/bwie-background/src/main/java/com/bwie/background/seriver/BackGroundService.java b/bwie-modules/bwie-background/src/main/java/com/bwie/background/seriver/BackGroundService.java new file mode 100644 index 0000000..899aadc --- /dev/null +++ b/bwie-modules/bwie-background/src/main/java/com/bwie/background/seriver/BackGroundService.java @@ -0,0 +1,4 @@ +package com.bwie.background.seriver; + +public interface BackGroundService { +} diff --git a/bwie-modules/bwie-background/src/main/java/com/bwie/background/seriver/impl/BackGroundServiceImpl.java b/bwie-modules/bwie-background/src/main/java/com/bwie/background/seriver/impl/BackGroundServiceImpl.java new file mode 100644 index 0000000..434287f --- /dev/null +++ b/bwie-modules/bwie-background/src/main/java/com/bwie/background/seriver/impl/BackGroundServiceImpl.java @@ -0,0 +1,10 @@ +package com.bwie.background.seriver.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bwie.background.mapper.BackGroundMapper; +import com.bwie.background.seriver.BackGroundService; +import org.springframework.stereotype.Service; + +@Service +public class BackGroundServiceImpl implements BackGroundService { +} diff --git a/bwie-modules/bwie-background/src/main/resources/bootstrap.yml b/bwie-modules/bwie-background/src/main/resources/bootstrap.yml index 51939cf..923dd75 100644 --- a/bwie-modules/bwie-background/src/main/resources/bootstrap.yml +++ b/bwie-modules/bwie-background/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9002 + port: 9003 # Spring spring: main: @@ -11,7 +11,7 @@ spring: time-zone: GMT+8 application: # 应用名称 - name: bwie-system + name: bwie-group profiles: # 环境配置 active: dev diff --git a/bwie-modules/bwie-background/src/main/resources/mapper/BackGroundMapper.xml b/bwie-modules/bwie-background/src/main/resources/mapper/BackGroundMapper.xml new file mode 100644 index 0000000..a070816 --- /dev/null +++ b/bwie-modules/bwie-background/src/main/resources/mapper/BackGroundMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/bwie-modules/bwie-system/pom.xml b/bwie-modules/bwie-system/pom.xml index 224606d..a588269 100644 --- a/bwie-modules/bwie-system/pom.xml +++ b/bwie-modules/bwie-system/pom.xml @@ -12,8 +12,8 @@ bwie-system - 17 - 17 + 8 + 8 UTF-8 @@ -58,5 +58,11 @@ spring-boot-starter-test test + + org.mybatis + mybatis-spring + 2.1.1 + compile + diff --git a/bwie-modules/bwie-system/src/main/java/com/bwie/system/mapper/SysMapper.java b/bwie-modules/bwie-system/src/main/java/com/bwie/system/mapper/SysMapper.java index 5775dc1..5f04bf4 100644 --- a/bwie-modules/bwie-system/src/main/java/com/bwie/system/mapper/SysMapper.java +++ b/bwie-modules/bwie-system/src/main/java/com/bwie/system/mapper/SysMapper.java @@ -1,4 +1,11 @@ package com.bwie.system.mapper; +import com.bwie.common.User; + +import java.util.List; + public interface SysMapper { + List shouall(); + + } From 3ee9b5c3d8a67da536c0baaedaa4170e66d851d9 Mon Sep 17 00:00:00 2001 From: jia <2744404105@qq.com> Date: Fri, 22 Mar 2024 19:22:58 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=9B=A2=E8=B4=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bwie/common/domain/Group.java | 50 +++++++++++++++++++ .../java/com/bwie/common/domain/SeeHouse.java | 22 ++++++++ 2 files changed, 72 insertions(+) create mode 100644 bwie-common/src/main/java/com/bwie/common/domain/Group.java create mode 100644 bwie-common/src/main/java/com/bwie/common/domain/SeeHouse.java diff --git a/bwie-common/src/main/java/com/bwie/common/domain/Group.java b/bwie-common/src/main/java/com/bwie/common/domain/Group.java new file mode 100644 index 0000000..f37b627 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/Group.java @@ -0,0 +1,50 @@ +package com.bwie.common.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@TableName("t_group") +public class Group { + @TableId + private Long groupId; //团购ID + private String groupTitle; //团购标题 + private String groupImage; //图片 + private String groupContent; //团购内容 + private String groupHouseName; // 房型名称 + private String groupHouseAddress; //房型地址 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date startTime; //开始时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date endTime; //结束时间 + private Long groupStatus; //团购状态1.已开团2.未开团 + private Long groupEnable; //是否开启1.是2.否 + private String groupIntroduce; //详情介绍 + private Long groupNumber; //开团报名人数 + private String groupAddress; //集合地址 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date groupTime; //集合时间 + private String groupLicense; //车牌号 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; //创建时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; //修改时间 + private Long isDelete; +} + diff --git a/bwie-common/src/main/java/com/bwie/common/domain/SeeHouse.java b/bwie-common/src/main/java/com/bwie/common/domain/SeeHouse.java new file mode 100644 index 0000000..b667edf --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/SeeHouse.java @@ -0,0 +1,22 @@ +package com.bwie.common.domain; + + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@TableName("t_see_house") +public class SeeHouse { + @TableId + private Long seeHouseId;//团购看房ID + private Long userId;//用户ID + private Long groupId;//团购ID--报名人数 + private Long seeHouseStatus;//状态1.我要报名2.已报名 +} From e7740a048c3ff867bc8680dcc87cb61bc45d5867 Mon Sep 17 00:00:00 2001 From: Guo YuKun <1458871005@qq.com> Date: Fri, 22 Mar 2024 19:31:21 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=9B=B4=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bwie/common/domain/AskBuy.java | 21 +++++++++---------- .../java/com/bwie/common/domain/AskRent.java | 20 +++++++++--------- .../java/com/bwie/common/domain/User.java | 13 ------------ 3 files changed, 20 insertions(+), 34 deletions(-) delete mode 100644 bwie-common/src/main/java/com/bwie/common/domain/User.java diff --git a/bwie-common/src/main/java/com/bwie/common/domain/AskBuy.java b/bwie-common/src/main/java/com/bwie/common/domain/AskBuy.java index 38fa460..2a4f1c8 100644 --- a/bwie-common/src/main/java/com/bwie/common/domain/AskBuy.java +++ b/bwie-common/src/main/java/com/bwie/common/domain/AskBuy.java @@ -18,19 +18,18 @@ import java.util.Date; @NoArgsConstructor @Builder public class AskBuy { - - private BigInteger askbuyId; - private String askbuyAddress; - private String askbuyTitle; - private BigInteger dictionarytypeId; - private BigInteger addrId; - private BigInteger userId; - private DecimalFormat askbuyPrice; - private BigInteger isDelete; + private BigInteger askBuyId; //求租ID + private String askBuyAddress; //求租具体地址 + private String askBuyTitle; //求租标签 + private BigInteger dictionaryTypeId; //求租类型 + private BigInteger addrId; //三级联动 + private BigInteger userId; //联系人 + private DecimalFormat askBuyPrice; //求租价格 + private BigInteger isDelete; //逻辑删除 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createTime; + private Date createTime; //创建时间 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date udpdateTime; + private Date updateTime; //修改时间 } diff --git a/bwie-common/src/main/java/com/bwie/common/domain/AskRent.java b/bwie-common/src/main/java/com/bwie/common/domain/AskRent.java index 2e72e32..9b69995 100644 --- a/bwie-common/src/main/java/com/bwie/common/domain/AskRent.java +++ b/bwie-common/src/main/java/com/bwie/common/domain/AskRent.java @@ -16,18 +16,18 @@ import java.util.Date; @NoArgsConstructor @Builder public class AskRent { - private BigInteger askrentId; - private String askbuyAddress; - private String askbuyTitle; - private BigInteger dictionarytypeId; - private BigInteger addrId; - private BigInteger userId; - private DecimalFormat askbuyPrice; - private BigInteger isDelete; + private BigInteger askRentId; //求租ID + private String askRentAddress; //求租具体地址 + private String askRentTitle; //求租标签 + private BigInteger dictionaryTypeId; //求租类型 + private BigInteger addrId; //三级联动 + private BigInteger userId; //联系人 + private DecimalFormat askRentPrice; //求租价格 + private BigInteger isDelete; //逻辑删除 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createTime; + private Date createTime; //创建时间 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date udpdateTime; + private Date updateTime; //修改时间 } diff --git a/bwie-common/src/main/java/com/bwie/common/domain/User.java b/bwie-common/src/main/java/com/bwie/common/domain/User.java deleted file mode 100644 index 416fcd3..0000000 --- a/bwie-common/src/main/java/com/bwie/common/domain/User.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.bwie.common.domain; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class User { -} From f09710eb732f36be4ab987abcdea97b4f9c5aa63 Mon Sep 17 00:00:00 2001 From: jia <2744404105@qq.com> Date: Fri, 22 Mar 2024 19:52:39 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/domain/request/GroupRequest.java | 49 +++++++++++++++++++ .../domain/request/SeeHouseRequest.java | 21 ++++++++ 2 files changed, 70 insertions(+) create mode 100644 bwie-common/src/main/java/com/bwie/common/domain/request/GroupRequest.java create mode 100644 bwie-common/src/main/java/com/bwie/common/domain/request/SeeHouseRequest.java diff --git a/bwie-common/src/main/java/com/bwie/common/domain/request/GroupRequest.java b/bwie-common/src/main/java/com/bwie/common/domain/request/GroupRequest.java new file mode 100644 index 0000000..f5f6cd7 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/request/GroupRequest.java @@ -0,0 +1,49 @@ +package com.bwie.common.domain.request; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@TableName("t_group") +public class GroupRequest { + @TableId + private Long groupId; //团购ID + private String groupTitle; //团购标题 + private String groupImage; //图片 + private String groupContent; //团购内容 + private String groupHouseName; // 房型名称 + private String groupHouseAddress; //房型地址 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date startTime; //开始时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date endTime; //结束时间 + private Long groupStatus; //团购状态1.已开团2.未开团 + private Long groupEnable; //是否开启1.是2.否 + private String groupIntroduce; //详情介绍 + private Long groupNumber; //开团报名人数 + private String groupAddress; //集合地址 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date groupTime; //集合时间 + private String groupLicense; //车牌号 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; //创建时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; //修改时间 + private Long isDelete; +} diff --git a/bwie-common/src/main/java/com/bwie/common/domain/request/SeeHouseRequest.java b/bwie-common/src/main/java/com/bwie/common/domain/request/SeeHouseRequest.java new file mode 100644 index 0000000..f6b6399 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/request/SeeHouseRequest.java @@ -0,0 +1,21 @@ +package com.bwie.common.domain.request; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@TableName("t_see_house") +public class SeeHouseRequest { + @TableId + private Long seeHouseId;//团购看房ID + private Long userId;//用户ID + private Long groupId;//团购ID--报名人数 + private Long seeHouseStatus;//状态1.我要报名2.已报名 +} \ No newline at end of file From 2758b49a1b71f274e0b2ba40f7076b93b012880b Mon Sep 17 00:00:00 2001 From: Guo YuKun <1458871005@qq.com> Date: Fri, 22 Mar 2024 19:55:18 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=9B=B4=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/encodings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 9c7a0a3..5a6ca03 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -7,6 +7,7 @@ + From e2864331e8c9bd9ca5c5dfc0fb60b0da2bf5ead4 Mon Sep 17 00:00:00 2001 From: Guo YuKun <1458871005@qq.com> Date: Fri, 22 Mar 2024 20:48:53 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=9B=B4=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bwie/common/domain/AskBuy.java | 4 ++ .../java/com/bwie/common/domain/AskRent.java | 4 ++ .../java/com/bwie/common/domain/Group.java | 1 + .../{background => ask}/AskMapperApp.java | 5 +-- .../bwie/ask/controller/AskBuyController.java | 36 +++++++++++++++ .../ask/controller/AskRentController.java | 36 +++++++++++++++ .../mapper/AskBuyMapper.java | 10 ++++- .../mapper/AskRentMapper.java | 8 +++- .../com/bwie/ask/seriver/AskBuyService.java | 15 +++++++ .../com/bwie/ask/seriver/AskRentService.java | 14 ++++++ .../ask/seriver/impl/AskBuyServiceImpl.java | 45 +++++++++++++++++++ .../ask/seriver/impl/AskRentServiceImpl.java | 40 +++++++++++++++++ .../controller/AskBuyController.java | 12 ----- .../controller/AskRentController.java | 12 ----- .../background/seriver/AskBuyService.java | 10 ----- .../background/seriver/AskRentService.java | 7 --- .../seriver/impl/AskBuyServiceImpl.java | 18 -------- .../seriver/impl/AskRentServiceImpl.java | 17 ------- .../main/resources/mapper/AskBuyMapper.xml | 11 ++++- .../main/resources/mapper/AskRentMapper.xml | 10 ++++- .../resources/mapper/BackGroundMapper.xml | 5 --- .../main/resources/mapper/AskRentMapper.xml | 1 + 22 files changed, 233 insertions(+), 88 deletions(-) rename bwie-modules/bwie-ask/src/main/java/com/bwie/{background => ask}/AskMapperApp.java (86%) create mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/AskBuyController.java create mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/AskRentController.java rename bwie-modules/bwie-ask/src/main/java/com/bwie/{background => ask}/mapper/AskBuyMapper.java (66%) rename bwie-modules/bwie-ask/src/main/java/com/bwie/{background => ask}/mapper/AskRentMapper.java (65%) create mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/AskBuyService.java create mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/AskRentService.java create mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/AskBuyServiceImpl.java create mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/AskRentServiceImpl.java delete mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/background/controller/AskBuyController.java delete mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/background/controller/AskRentController.java delete mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/background/seriver/AskBuyService.java delete mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/background/seriver/AskRentService.java delete mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/background/seriver/impl/AskBuyServiceImpl.java delete mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/background/seriver/impl/AskRentServiceImpl.java delete mode 100644 bwie-modules/bwie-ask/src/main/resources/mapper/BackGroundMapper.xml diff --git a/bwie-common/src/main/java/com/bwie/common/domain/AskBuy.java b/bwie-common/src/main/java/com/bwie/common/domain/AskBuy.java index 2a4f1c8..cdd38af 100644 --- a/bwie-common/src/main/java/com/bwie/common/domain/AskBuy.java +++ b/bwie-common/src/main/java/com/bwie/common/domain/AskBuy.java @@ -1,4 +1,6 @@ package com.bwie.common.domain; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Builder; @@ -17,7 +19,9 @@ import java.util.Date; @AllArgsConstructor @NoArgsConstructor @Builder +@TableName("askbuy") public class AskBuy { + @TableId private BigInteger askBuyId; //求租ID private String askBuyAddress; //求租具体地址 private String askBuyTitle; //求租标签 diff --git a/bwie-common/src/main/java/com/bwie/common/domain/AskRent.java b/bwie-common/src/main/java/com/bwie/common/domain/AskRent.java index 9b69995..1775d7f 100644 --- a/bwie-common/src/main/java/com/bwie/common/domain/AskRent.java +++ b/bwie-common/src/main/java/com/bwie/common/domain/AskRent.java @@ -1,4 +1,6 @@ package com.bwie.common.domain; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Builder; @@ -15,7 +17,9 @@ import java.util.Date; @AllArgsConstructor @NoArgsConstructor @Builder +@TableName("askrent") public class AskRent { + @TableId private BigInteger askRentId; //求租ID private String askRentAddress; //求租具体地址 private String askRentTitle; //求租标签 diff --git a/bwie-common/src/main/java/com/bwie/common/domain/Group.java b/bwie-common/src/main/java/com/bwie/common/domain/Group.java index f37b627..540335f 100644 --- a/bwie-common/src/main/java/com/bwie/common/domain/Group.java +++ b/bwie-common/src/main/java/com/bwie/common/domain/Group.java @@ -9,6 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import org.springframework.format.annotation.DateTimeFormat; +import java.math.BigInteger; import java.util.Date; @Data diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/background/AskMapperApp.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/AskMapperApp.java similarity index 86% rename from bwie-modules/bwie-ask/src/main/java/com/bwie/background/AskMapperApp.java rename to bwie-modules/bwie-ask/src/main/java/com/bwie/ask/AskMapperApp.java index c20f5b1..1f90d99 100644 --- a/bwie-modules/bwie-ask/src/main/java/com/bwie/background/AskMapperApp.java +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/AskMapperApp.java @@ -1,13 +1,12 @@ -package com.bwie.background; +package com.bwie.ask; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; - @SpringBootApplication @EnableDiscoveryClient -@MapperScan("com.bwie.group.mapper") +@MapperScan("com.bwie.ask.mapper") public class AskMapperApp { public static void main(String[] args) { SpringApplication.run(AskMapperApp.class); diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/AskBuyController.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/AskBuyController.java new file mode 100644 index 0000000..42d67eb --- /dev/null +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/AskBuyController.java @@ -0,0 +1,36 @@ +package com.bwie.ask.controller; + +import com.bwie.ask.seriver.AskBuyService; +import com.bwie.common.domain.AskBuy; +import com.bwie.common.result.Result; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 求购controller层 + */ +@RestController +@RequestMapping("/buy") +public class AskBuyController { + + private final AskBuyService askBuyService; + + public AskBuyController(AskBuyService askBuyService) { + this.askBuyService = askBuyService; + } + + @PostMapping("/shouAll") + public Result> shouAll(){ + return askBuyService.shouAll(); + } + + @PostMapping("/addAskBuy") + public Result addAskBuy(@RequestBody AskBuy askBuy){ + return askBuyService.addAskBuy(askBuy); + } + +} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/AskRentController.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/AskRentController.java new file mode 100644 index 0000000..ca3e917 --- /dev/null +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/AskRentController.java @@ -0,0 +1,36 @@ +package com.bwie.ask.controller; + +import com.bwie.ask.seriver.AskRentService; +import com.bwie.common.domain.AskRent; +import com.bwie.common.result.Result; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 求租controller层 + */ +@RestController +@RequestMapping("/rent") +public class AskRentController { + + private final AskRentService askRentService; + + public AskRentController(AskRentService askRentService) { + this.askRentService = askRentService; + } + + + @PostMapping("/shouList") + public Result> shouList(){ + return askRentService.shouList(); + } + @PostMapping("/addAskRent") + public Result addAskRent(@RequestBody AskRent askRent){ + return askRentService.addAskRent(askRent); + } + +} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/background/mapper/AskBuyMapper.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/mapper/AskBuyMapper.java similarity index 66% rename from bwie-modules/bwie-ask/src/main/java/com/bwie/background/mapper/AskBuyMapper.java rename to bwie-modules/bwie-ask/src/main/java/com/bwie/ask/mapper/AskBuyMapper.java index b599d38..003eef9 100644 --- a/bwie-modules/bwie-ask/src/main/java/com/bwie/background/mapper/AskBuyMapper.java +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/mapper/AskBuyMapper.java @@ -1,9 +1,11 @@ -package com.bwie.background.mapper; +package com.bwie.ask.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.bwie.common.domain.AskBuy; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 求购mapper层 */ @@ -11,4 +13,10 @@ import org.apache.ibatis.annotations.Mapper; public interface AskBuyMapper extends BaseMapper { + List shouAll(); + + + Integer addAskBuy(AskBuy askBuy); + + } diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/background/mapper/AskRentMapper.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/mapper/AskRentMapper.java similarity index 65% rename from bwie-modules/bwie-ask/src/main/java/com/bwie/background/mapper/AskRentMapper.java rename to bwie-modules/bwie-ask/src/main/java/com/bwie/ask/mapper/AskRentMapper.java index 82c4348..a4967b0 100644 --- a/bwie-modules/bwie-ask/src/main/java/com/bwie/background/mapper/AskRentMapper.java +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/mapper/AskRentMapper.java @@ -1,12 +1,18 @@ -package com.bwie.background.mapper; +package com.bwie.ask.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.bwie.common.domain.AskRent; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 求租mapper层 */ @Mapper public interface AskRentMapper extends BaseMapper { + List shouList(); + + Integer addAskRent(AskRent askRent); + } diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/AskBuyService.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/AskBuyService.java new file mode 100644 index 0000000..f8c51e6 --- /dev/null +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/AskBuyService.java @@ -0,0 +1,15 @@ +package com.bwie.ask.seriver; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.bwie.common.domain.AskBuy; +import com.bwie.common.result.Result; + +import java.util.List; + +public interface AskBuyService extends IService { + + + public Result> shouAll(); + + public Result addAskBuy(AskBuy askBuy); +} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/AskRentService.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/AskRentService.java new file mode 100644 index 0000000..dda0cea --- /dev/null +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/AskRentService.java @@ -0,0 +1,14 @@ +package com.bwie.ask.seriver; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.bwie.common.domain.AskRent; +import com.bwie.common.result.Result; + +import java.util.List; + +public interface AskRentService extends IService { + + public Result> shouList(); + + public Result addAskRent(AskRent askRent); +} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/AskBuyServiceImpl.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/AskBuyServiceImpl.java new file mode 100644 index 0000000..252b3a5 --- /dev/null +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/AskBuyServiceImpl.java @@ -0,0 +1,45 @@ +package com.bwie.ask.seriver.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bwie.ask.mapper.AskBuyMapper; +import com.bwie.ask.seriver.AskBuyService; +import com.bwie.common.domain.AskBuy; +import com.bwie.common.result.Result; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 求购 + */ +@Service +public class AskBuyServiceImpl extends ServiceImpl implements AskBuyService { + + + private final AskBuyMapper askBuyMapper; + + + public AskBuyServiceImpl(AskBuyMapper askBuyMapper) { + this.askBuyMapper = askBuyMapper; + } + + /** + * 求购的普通链表 + * @return + */ + @Override + public Result> shouAll(){ + List askBuys = askBuyMapper.shouAll(); + return Result.success(askBuys); + } + @Override + public Result addAskBuy(AskBuy askBuy){ + Integer i = askBuyMapper.addAskBuy(askBuy); + return Result.success(i>0?200:500,i>0?"发表成功!!!!":"发表失败!!!!"); + } + + + + + +} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/AskRentServiceImpl.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/AskRentServiceImpl.java new file mode 100644 index 0000000..1f48b94 --- /dev/null +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/AskRentServiceImpl.java @@ -0,0 +1,40 @@ +package com.bwie.ask.seriver.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bwie.ask.mapper.AskRentMapper; +import com.bwie.ask.seriver.AskRentService; +import com.bwie.common.domain.AskRent; +import com.bwie.common.result.Result; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 求租 + */ +@Service +public class AskRentServiceImpl extends ServiceImpl implements AskRentService { + + private final AskRentMapper askRentMapper; + + public AskRentServiceImpl(AskRentMapper askRentMapper) { + this.askRentMapper = askRentMapper; + } + + /** + * 求租的普通链表 + * @return + */ + @Override + public Result> shouList(){ + List askRentList = askRentMapper.shouList(); + return Result.success(askRentList); + } + + @Override + public Result addAskRent(AskRent askRent){ + Integer i = askRentMapper.addAskRent(askRent); + return Result.success(i>0?200:500,i>0?"发表成功!!!!":"发表失败!!!!"); + } + +} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/background/controller/AskBuyController.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/background/controller/AskBuyController.java deleted file mode 100644 index 715d1b7..0000000 --- a/bwie-modules/bwie-ask/src/main/java/com/bwie/background/controller/AskBuyController.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.bwie.background.controller; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 求购controller层 - */ -@RestController -@RequestMapping("/buy") -public class AskBuyController { -} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/background/controller/AskRentController.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/background/controller/AskRentController.java deleted file mode 100644 index 900c870..0000000 --- a/bwie-modules/bwie-ask/src/main/java/com/bwie/background/controller/AskRentController.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.bwie.background.controller; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 求租controller层 - */ -@RestController -@RequestMapping("/rent") -public class AskRentController { -} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/background/seriver/AskBuyService.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/background/seriver/AskBuyService.java deleted file mode 100644 index 1d6be49..0000000 --- a/bwie-modules/bwie-ask/src/main/java/com/bwie/background/seriver/AskBuyService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.bwie.background.seriver; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.bwie.common.domain.AskBuy; - -public interface AskBuyService extends IService { - - - -} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/background/seriver/AskRentService.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/background/seriver/AskRentService.java deleted file mode 100644 index 8f47027..0000000 --- a/bwie-modules/bwie-ask/src/main/java/com/bwie/background/seriver/AskRentService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.bwie.background.seriver; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.bwie.common.domain.AskRent; - -public interface AskRentService extends IService { -} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/background/seriver/impl/AskBuyServiceImpl.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/background/seriver/impl/AskBuyServiceImpl.java deleted file mode 100644 index e561989..0000000 --- a/bwie-modules/bwie-ask/src/main/java/com/bwie/background/seriver/impl/AskBuyServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.bwie.background.seriver.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.bwie.background.mapper.AskBuyMapper; -import com.bwie.background.seriver.AskBuyService; -import com.bwie.common.domain.AskBuy; -import org.springframework.stereotype.Service; - -/** - * 求购 - */ -@Service -public class AskBuyServiceImpl extends ServiceImpl implements AskBuyService { - - - - -} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/background/seriver/impl/AskRentServiceImpl.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/background/seriver/impl/AskRentServiceImpl.java deleted file mode 100644 index ba4b45c..0000000 --- a/bwie-modules/bwie-ask/src/main/java/com/bwie/background/seriver/impl/AskRentServiceImpl.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.bwie.background.seriver.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.bwie.background.mapper.AskRentMapper; -import com.bwie.background.seriver.AskRentService; -import com.bwie.common.domain.AskRent; -import org.springframework.stereotype.Service; - -/** - * 求租 - */ -@Service -public class AskRentServiceImpl extends ServiceImpl implements AskRentService { - - - -} diff --git a/bwie-modules/bwie-ask/src/main/resources/mapper/AskBuyMapper.xml b/bwie-modules/bwie-ask/src/main/resources/mapper/AskBuyMapper.xml index f5ce631..c90155f 100644 --- a/bwie-modules/bwie-ask/src/main/resources/mapper/AskBuyMapper.xml +++ b/bwie-modules/bwie-ask/src/main/resources/mapper/AskBuyMapper.xml @@ -1,5 +1,14 @@ - + + + + INSERT INTO `xm_house`.`askbuy` (`askbuy_address`, `askbuy_title`, `dictionary_type_id`, `addr_id`, `user_id`, `askbuy_price`, `is_delete`, `create_time`, `update_time`) + VALUES (#{askBuyAddress},#{askbuy},#{dictionaryTypeId},#{addrId},#{userId},#{askBuyPrice},#{isDelete},#{createTime},#{updateTime}); + + + diff --git a/bwie-modules/bwie-ask/src/main/resources/mapper/AskRentMapper.xml b/bwie-modules/bwie-ask/src/main/resources/mapper/AskRentMapper.xml index 6347138..da56b57 100644 --- a/bwie-modules/bwie-ask/src/main/resources/mapper/AskRentMapper.xml +++ b/bwie-modules/bwie-ask/src/main/resources/mapper/AskRentMapper.xml @@ -1,5 +1,13 @@ - + + + INSERT INTO `xm_house`.`askrent` (`askrent_address`, `askrent_title`, `dictionary_type_id`, `addr_id`, `user_id`, `askrent_price`, `is_delete`, +`craete_time`, `update_time`) + VALUES (#{askRentAddress},#{askRentTitle},#{dictionaryTypeId},#{addrId},#{userId},#{askRentPrice},#{isDelete},#{createTime},#{updateTime}); + + diff --git a/bwie-modules/bwie-ask/src/main/resources/mapper/BackGroundMapper.xml b/bwie-modules/bwie-ask/src/main/resources/mapper/BackGroundMapper.xml deleted file mode 100644 index a070816..0000000 --- a/bwie-modules/bwie-ask/src/main/resources/mapper/BackGroundMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/bwie-modules/bwie-background/src/main/resources/mapper/AskRentMapper.xml b/bwie-modules/bwie-background/src/main/resources/mapper/AskRentMapper.xml index 6347138..b26ae5d 100644 --- a/bwie-modules/bwie-background/src/main/resources/mapper/AskRentMapper.xml +++ b/bwie-modules/bwie-background/src/main/resources/mapper/AskRentMapper.xml @@ -2,4 +2,5 @@ + From fa8257a2400a40508ba7bb2c55e244be6b5e058f Mon Sep 17 00:00:00 2001 From: Guo YuKun <1458871005@qq.com> Date: Fri, 22 Mar 2024 22:06:32 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=9B=B4=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bwie/common/domain/AskBuy.java | 14 +++++++------- .../main/java/com/bwie/common/domain/AskRent.java | 15 ++++++++------- .../main/java/com/bwie/common/domain/Group.java | 2 +- .../bwie/ask/{AskMapperApp.java => AskApp.java} | 4 ++-- .../bwie/ask/controller/AskRentController.java | 9 +-------- .../bwie-ask/src/main/resources/bootstrap.yml | 2 +- 6 files changed, 20 insertions(+), 26 deletions(-) rename bwie-modules/bwie-ask/src/main/java/com/bwie/ask/{AskMapperApp.java => AskApp.java} (83%) diff --git a/bwie-common/src/main/java/com/bwie/common/domain/AskBuy.java b/bwie-common/src/main/java/com/bwie/common/domain/AskBuy.java index cdd38af..a77eff8 100644 --- a/bwie-common/src/main/java/com/bwie/common/domain/AskBuy.java +++ b/bwie-common/src/main/java/com/bwie/common/domain/AskBuy.java @@ -8,7 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import org.springframework.format.annotation.DateTimeFormat; -import java.math.BigInteger; +import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.Date; @@ -22,14 +22,14 @@ import java.util.Date; @TableName("askbuy") public class AskBuy { @TableId - private BigInteger askBuyId; //求租ID + private Long askBuyId; //求租ID private String askBuyAddress; //求租具体地址 private String askBuyTitle; //求租标签 - private BigInteger dictionaryTypeId; //求租类型 - private BigInteger addrId; //三级联动 - private BigInteger userId; //联系人 - private DecimalFormat askBuyPrice; //求租价格 - private BigInteger isDelete; //逻辑删除 + private Long dictionaryTypeId; //求租类型 + private Long addrId; //三级联动 + private Long userId; //联系人 + private BigDecimal askBuyPrice; //求租价格 + private Long isDelete; //逻辑删除 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; //创建时间 diff --git a/bwie-common/src/main/java/com/bwie/common/domain/AskRent.java b/bwie-common/src/main/java/com/bwie/common/domain/AskRent.java index 1775d7f..ebe6c85 100644 --- a/bwie-common/src/main/java/com/bwie/common/domain/AskRent.java +++ b/bwie-common/src/main/java/com/bwie/common/domain/AskRent.java @@ -7,7 +7,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import org.springframework.format.annotation.DateTimeFormat; -import java.math.BigInteger; + +import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.Date; /** @@ -20,14 +21,14 @@ import java.util.Date; @TableName("askrent") public class AskRent { @TableId - private BigInteger askRentId; //求租ID + private Long askRentId; //求租ID private String askRentAddress; //求租具体地址 private String askRentTitle; //求租标签 - private BigInteger dictionaryTypeId; //求租类型 - private BigInteger addrId; //三级联动 - private BigInteger userId; //联系人 - private DecimalFormat askRentPrice; //求租价格 - private BigInteger isDelete; //逻辑删除 + private Long dictionaryTypeId; //求租类型 + private Long addrId; //三级联动 + private Long userId; //联系人 + private BigDecimal askRentPrice; //求租价格 + private Long isDelete; //逻辑删除 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; //创建时间 diff --git a/bwie-common/src/main/java/com/bwie/common/domain/Group.java b/bwie-common/src/main/java/com/bwie/common/domain/Group.java index 540335f..4ea6472 100644 --- a/bwie-common/src/main/java/com/bwie/common/domain/Group.java +++ b/bwie-common/src/main/java/com/bwie/common/domain/Group.java @@ -9,7 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import org.springframework.format.annotation.DateTimeFormat; -import java.math.BigInteger; + import java.util.Date; @Data diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/AskMapperApp.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/AskApp.java similarity index 83% rename from bwie-modules/bwie-ask/src/main/java/com/bwie/ask/AskMapperApp.java rename to bwie-modules/bwie-ask/src/main/java/com/bwie/ask/AskApp.java index 1f90d99..acaf2f3 100644 --- a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/AskMapperApp.java +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/AskApp.java @@ -7,8 +7,8 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @SpringBootApplication @EnableDiscoveryClient @MapperScan("com.bwie.ask.mapper") -public class AskMapperApp { +public class AskApp { public static void main(String[] args) { - SpringApplication.run(AskMapperApp.class); + SpringApplication.run(AskApp.class); } } diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/AskRentController.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/AskRentController.java index ca3e917..e4abe23 100644 --- a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/AskRentController.java +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/AskRentController.java @@ -1,5 +1,5 @@ package com.bwie.ask.controller; - +import com.bwie.ask.AskApp; import com.bwie.ask.seriver.AskRentService; import com.bwie.common.domain.AskRent; import com.bwie.common.result.Result; @@ -7,23 +7,17 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; - import java.util.List; - /** * 求租controller层 */ @RestController @RequestMapping("/rent") public class AskRentController { - private final AskRentService askRentService; - public AskRentController(AskRentService askRentService) { this.askRentService = askRentService; } - - @PostMapping("/shouList") public Result> shouList(){ return askRentService.shouList(); @@ -32,5 +26,4 @@ public class AskRentController { public Result addAskRent(@RequestBody AskRent askRent){ return askRentService.addAskRent(askRent); } - } diff --git a/bwie-modules/bwie-ask/src/main/resources/bootstrap.yml b/bwie-modules/bwie-ask/src/main/resources/bootstrap.yml index 923dd75..125a762 100644 --- a/bwie-modules/bwie-ask/src/main/resources/bootstrap.yml +++ b/bwie-modules/bwie-ask/src/main/resources/bootstrap.yml @@ -11,7 +11,7 @@ spring: time-zone: GMT+8 application: # 应用名称 - name: bwie-group + name: bwie-ask profiles: # 环境配置 active: dev From cd0fab23c109c75f7a66efc9a5c3a2e3febb24c1 Mon Sep 17 00:00:00 2001 From: jia <2744404105@qq.com> Date: Fri, 22 Mar 2024 22:08:43 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/encodings.xml | 1 + .../com/bwie/common/domain/Dictionary.java | 22 +++++++ .../bwie/common/domain/DictionaryType.java | 23 +++++++ .../java/com/bwie/common/domain/House.java | 46 ++++++++++++++ .../com/bwie/common/domain/HouseExamine.java | 22 +++++++ .../com/bwie/common/domain/HouseImages.java | 22 +++++++ .../com/bwie/common/domain/HouseType.java | 18 ++++++ .../domain/request/HouseFindRequest.java | 29 +++++++++ .../bwie/background/BackgroundMapperApp.java | 6 +- bwie-modules/bwie-home/pom.xml | 63 +++++++++++++++++++ .../src/main/java/com/bwie/home/HomeApp.java | 15 +++++ .../bwie/home/controller/HomeController.java | 4 ++ .../java/com/bwie/home/mapper/HomeMapper.java | 4 ++ .../com/bwie/home/service/HomeService.java | 4 ++ .../bwie/home/service/HomeServiceImpl.java | 4 ++ .../src/main/resources/mapper/HomeMapper.xml | 5 ++ pom.xml | 1 + 17 files changed, 286 insertions(+), 3 deletions(-) create mode 100644 bwie-common/src/main/java/com/bwie/common/domain/Dictionary.java create mode 100644 bwie-common/src/main/java/com/bwie/common/domain/DictionaryType.java create mode 100644 bwie-common/src/main/java/com/bwie/common/domain/House.java create mode 100644 bwie-common/src/main/java/com/bwie/common/domain/HouseExamine.java create mode 100644 bwie-common/src/main/java/com/bwie/common/domain/HouseImages.java create mode 100644 bwie-common/src/main/java/com/bwie/common/domain/HouseType.java create mode 100644 bwie-common/src/main/java/com/bwie/common/domain/request/HouseFindRequest.java create mode 100644 bwie-modules/bwie-home/pom.xml create mode 100644 bwie-modules/bwie-home/src/main/java/com/bwie/home/HomeApp.java create mode 100644 bwie-modules/bwie-home/src/main/java/com/bwie/home/controller/HomeController.java create mode 100644 bwie-modules/bwie-home/src/main/java/com/bwie/home/mapper/HomeMapper.java create mode 100644 bwie-modules/bwie-home/src/main/java/com/bwie/home/service/HomeService.java create mode 100644 bwie-modules/bwie-home/src/main/java/com/bwie/home/service/HomeServiceImpl.java create mode 100644 bwie-modules/bwie-home/src/main/resources/mapper/HomeMapper.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 9c7a0a3..5a6ca03 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -7,6 +7,7 @@ + diff --git a/bwie-common/src/main/java/com/bwie/common/domain/Dictionary.java b/bwie-common/src/main/java/com/bwie/common/domain/Dictionary.java new file mode 100644 index 0000000..7309d17 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/Dictionary.java @@ -0,0 +1,22 @@ +package com.bwie.common.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@TableName("dictionary") +public class Dictionary { + + @TableId(type = IdType.AUTO) + private Long dictionary_id; //字典id + private String dictionary_type; //字典类型 + +} diff --git a/bwie-common/src/main/java/com/bwie/common/domain/DictionaryType.java b/bwie-common/src/main/java/com/bwie/common/domain/DictionaryType.java new file mode 100644 index 0000000..79047a1 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/DictionaryType.java @@ -0,0 +1,23 @@ +package com.bwie.common.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@TableName("dictionary_type") +public class DictionaryType { + + @TableId(type = IdType.AUTO) + private Long dictionaryTypeId; //字典详情id + private Long dictionaryId; //字典表id + private String dictionaryTypeLabel; //具体类型 + +} diff --git a/bwie-common/src/main/java/com/bwie/common/domain/House.java b/bwie-common/src/main/java/com/bwie/common/domain/House.java new file mode 100644 index 0000000..fe7513e --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/House.java @@ -0,0 +1,46 @@ +package com.bwie.common.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@TableName("house") +public class House { + @TableId(type = IdType.AUTO) + private Long id; //主键 + private Long userId; //发布人id + private String title; //标题 + private String estate; //小区 + private Long houseTypeId; //发布类型id-- 2手房出售 有房出租 我想买房 租房 帮我找房 + private Long addrId; //区域id + private String houseAddr; //房源详细地址 + private BigDecimal housePrice; //价格 + private String roomType; //户型 + private String orientation; //朝向 + private String decorate; //装修 + private String floor; //楼层 + private Integer acreage; //面积 + private String sellingPoints; //核心卖点 + private String mentality; //业主心态 + private String serviceIntroduction; //服务介绍 + private Integer managerStatus; //房源管理状态 + private Long brokerId; //经纪人id + private Integer isSuccess; //是否交易成功【0-成功 1-失败】 + private Integer verify; //是否验真【0-已验真 1-未验真】 + private Integer isEs; //是否同步es【0-同步 1-未同步】 + private Date createTime; //创建时间 + private Date updateTime; //最近更新时间 + private Integer isDelete; //逻辑删除字段 + +} diff --git a/bwie-common/src/main/java/com/bwie/common/domain/HouseExamine.java b/bwie-common/src/main/java/com/bwie/common/domain/HouseExamine.java new file mode 100644 index 0000000..1f52000 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/HouseExamine.java @@ -0,0 +1,22 @@ +package com.bwie.common.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@TableName("house_examine") +public class HouseExamine { + + @TableId(type = IdType.AUTO) + private Long houseExamineId; //房源审核表 + private Long houseId; //房源id + private String houseExamineStatus; //房源状态 -- 0未审核2审核中3通过4驳回 +} diff --git a/bwie-common/src/main/java/com/bwie/common/domain/HouseImages.java b/bwie-common/src/main/java/com/bwie/common/domain/HouseImages.java new file mode 100644 index 0000000..5ef4c7a --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/HouseImages.java @@ -0,0 +1,22 @@ +package com.bwie.common.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@TableName("house_images") +public class HouseImages { + + @TableId(type = IdType.AUTO) + private Long id; //id + private Long houseId; //房型id + private String imageAddr; //图片地址 +} diff --git a/bwie-common/src/main/java/com/bwie/common/domain/HouseType.java b/bwie-common/src/main/java/com/bwie/common/domain/HouseType.java new file mode 100644 index 0000000..d1829dc --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/HouseType.java @@ -0,0 +1,18 @@ +package com.bwie.common.domain; + +import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@TableName("house_type") +public class HouseType { + private Long id; //id + private String name; //房产发布类型名称 +} diff --git a/bwie-common/src/main/java/com/bwie/common/domain/request/HouseFindRequest.java b/bwie-common/src/main/java/com/bwie/common/domain/request/HouseFindRequest.java new file mode 100644 index 0000000..dd74499 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/request/HouseFindRequest.java @@ -0,0 +1,29 @@ +package com.bwie.common.domain.request; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class HouseFindRequest { + + private Long roomTypeId; // 字典详情 id 商户 写字楼小区 + + private Long addrId; //区域id + private BigDecimal housePrice; //价格 + + private String roomType; //户型 + private String orientation; //朝向 + private Integer verify; //是否验真【0-已验真 1-未验真】 + + + + + +} diff --git a/bwie-modules/bwie-background/src/main/java/com/bwie/background/BackgroundMapperApp.java b/bwie-modules/bwie-background/src/main/java/com/bwie/background/BackgroundMapperApp.java index 64cc707..b3f977f 100644 --- a/bwie-modules/bwie-background/src/main/java/com/bwie/background/BackgroundMapperApp.java +++ b/bwie-modules/bwie-background/src/main/java/com/bwie/background/BackgroundMapperApp.java @@ -7,9 +7,9 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @SpringBootApplication @EnableDiscoveryClient -@MapperScan("com.bwie.group.mapper") -public class BackgroundMapperApp { +@MapperScan("com.bwie.background.mapper") +public class BackgroundApp { public static void main(String[] args) { - SpringApplication.run(BackgroundMapperApp.class); + SpringApplication.run(BackgroundApp.class); } } diff --git a/bwie-modules/bwie-home/pom.xml b/bwie-modules/bwie-home/pom.xml new file mode 100644 index 0000000..d601063 --- /dev/null +++ b/bwie-modules/bwie-home/pom.xml @@ -0,0 +1,63 @@ + + + 4.0.0 + + com.bwie + house_project + 1.0.0 + ../../pom.xml + + + bwie-home + + + 8 + 8 + UTF-8 + + + + + com.bwie + bwie-common + + + + org.springframework.boot + spring-boot-starter-web + + + + + com.alibaba + druid-spring-boot-starter + 1.2.8 + + + + mysql + mysql-connector-java + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 2.2.2 + + + + + com.github.pagehelper + pagehelper-spring-boot-starter + 1.4.1 + + + + org.springframework.boot + spring-boot-starter-test + test + + + diff --git a/bwie-modules/bwie-home/src/main/java/com/bwie/home/HomeApp.java b/bwie-modules/bwie-home/src/main/java/com/bwie/home/HomeApp.java new file mode 100644 index 0000000..963d338 --- /dev/null +++ b/bwie-modules/bwie-home/src/main/java/com/bwie/home/HomeApp.java @@ -0,0 +1,15 @@ +package com.bwie.home; + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; + +@SpringBootApplication +@EnableDiscoveryClient +@MapperScan("com.bwie.home.mapper") +public class HomeApp { + public static void main(String[] args) { + SpringApplication.run(HomeApp.class); + } +} diff --git a/bwie-modules/bwie-home/src/main/java/com/bwie/home/controller/HomeController.java b/bwie-modules/bwie-home/src/main/java/com/bwie/home/controller/HomeController.java new file mode 100644 index 0000000..1f7329b --- /dev/null +++ b/bwie-modules/bwie-home/src/main/java/com/bwie/home/controller/HomeController.java @@ -0,0 +1,4 @@ +package com.bwie.home.controller; + +public class HomeController { +} diff --git a/bwie-modules/bwie-home/src/main/java/com/bwie/home/mapper/HomeMapper.java b/bwie-modules/bwie-home/src/main/java/com/bwie/home/mapper/HomeMapper.java new file mode 100644 index 0000000..449efa9 --- /dev/null +++ b/bwie-modules/bwie-home/src/main/java/com/bwie/home/mapper/HomeMapper.java @@ -0,0 +1,4 @@ +package com.bwie.home.mapper; + +public interface HomeMapper { +} diff --git a/bwie-modules/bwie-home/src/main/java/com/bwie/home/service/HomeService.java b/bwie-modules/bwie-home/src/main/java/com/bwie/home/service/HomeService.java new file mode 100644 index 0000000..1016eab --- /dev/null +++ b/bwie-modules/bwie-home/src/main/java/com/bwie/home/service/HomeService.java @@ -0,0 +1,4 @@ +package com.bwie.home.service; + +public interface HomeService { +} diff --git a/bwie-modules/bwie-home/src/main/java/com/bwie/home/service/HomeServiceImpl.java b/bwie-modules/bwie-home/src/main/java/com/bwie/home/service/HomeServiceImpl.java new file mode 100644 index 0000000..7a86c9e --- /dev/null +++ b/bwie-modules/bwie-home/src/main/java/com/bwie/home/service/HomeServiceImpl.java @@ -0,0 +1,4 @@ +package com.bwie.home.service; + +public class HomeServiceImpl { +} diff --git a/bwie-modules/bwie-home/src/main/resources/mapper/HomeMapper.xml b/bwie-modules/bwie-home/src/main/resources/mapper/HomeMapper.xml new file mode 100644 index 0000000..fea1917 --- /dev/null +++ b/bwie-modules/bwie-home/src/main/resources/mapper/HomeMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/pom.xml b/pom.xml index dfc489c..21104bc 100644 --- a/pom.xml +++ b/pom.xml @@ -15,6 +15,7 @@ bwie-gateway bwie-modules/bwie-background bwie-modules/bwie-ask + bwie-modules/bwie-home From df8f272cb0d0a3e50451088f6c2e829f948714c3 Mon Sep 17 00:00:00 2001 From: Guo YuKun <1458871005@qq.com> Date: Sat, 23 Mar 2024 11:32:27 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=9B=B4=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bwie/common/domain/AskBuy.java | 13 +++++++++- .../java/com/bwie/common/domain/AskRent.java | 13 +++++++++- .../java/com/bwie/common/domain/Group.java | 1 + .../common/domain/request/AskBuyRequest.java | 25 +++++++++++++++++++ .../common/domain/request/AskRentRequest.java | 24 ++++++++++++++++++ .../domain/request/SeeHouseRequest.java | 3 ++- .../ask/controller/EsAskBuyController.java | 19 ++++++++++++++ .../ask/controller/EsAskRentController.java | 19 ++++++++++++++ .../com/bwie/ask/mapper/EsAskBuyMapper.java | 12 +++++++++ .../com/bwie/ask/mapper/EsAskRentMapper.java | 20 +++++++++++++++ .../com/bwie/ask/seriver/EsAskBuyService.java | 8 ++++++ .../bwie/ask/seriver/EsAskRentService.java | 10 ++++++++ .../ask/seriver/impl/EsAskBuyServiceImpl.java | 22 ++++++++++++++++ .../seriver/impl/EsAskRentServiceImpl.java | 24 ++++++++++++++++++ .../main/resources/mapper/EsAskBuyMapper.xml | 5 ++++ .../main/resources/mapper/EsAskRentMapper.xml | 5 ++++ 16 files changed, 220 insertions(+), 3 deletions(-) create mode 100644 bwie-common/src/main/java/com/bwie/common/domain/request/AskBuyRequest.java create mode 100644 bwie-common/src/main/java/com/bwie/common/domain/request/AskRentRequest.java create mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/EsAskBuyController.java create mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/EsAskRentController.java create mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/ask/mapper/EsAskBuyMapper.java create mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/ask/mapper/EsAskRentMapper.java create mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/EsAskBuyService.java create mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/EsAskRentService.java create mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/EsAskBuyServiceImpl.java create mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/EsAskRentServiceImpl.java create mode 100644 bwie-modules/bwie-ask/src/main/resources/mapper/EsAskBuyMapper.xml create mode 100644 bwie-modules/bwie-ask/src/main/resources/mapper/EsAskRentMapper.xml diff --git a/bwie-common/src/main/java/com/bwie/common/domain/AskBuy.java b/bwie-common/src/main/java/com/bwie/common/domain/AskBuy.java index a77eff8..3ec510a 100644 --- a/bwie-common/src/main/java/com/bwie/common/domain/AskBuy.java +++ b/bwie-common/src/main/java/com/bwie/common/domain/AskBuy.java @@ -1,4 +1,6 @@ package com.bwie.common.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -21,19 +23,28 @@ import java.util.Date; @Builder @TableName("askbuy") public class AskBuy { - @TableId + @TableId(value = "askbuy_id",type = IdType.AUTO) private Long askBuyId; //求租ID + @TableField("askbuy_address") private String askBuyAddress; //求租具体地址 + @TableField("askbuy_title") private String askBuyTitle; //求租标签 + @TableField("dictionary_type_id") private Long dictionaryTypeId; //求租类型 + @TableField("addr_id") private Long addrId; //三级联动 + @TableField("user_id") private Long userId; //联系人 + @TableField("askbuy_price") private BigDecimal askBuyPrice; //求租价格 + @TableField("is_delete") private Long isDelete; //逻辑删除 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("create_time") private Date createTime; //创建时间 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("update_time") private Date updateTime; //修改时间 } diff --git a/bwie-common/src/main/java/com/bwie/common/domain/AskRent.java b/bwie-common/src/main/java/com/bwie/common/domain/AskRent.java index ebe6c85..8c73f13 100644 --- a/bwie-common/src/main/java/com/bwie/common/domain/AskRent.java +++ b/bwie-common/src/main/java/com/bwie/common/domain/AskRent.java @@ -1,4 +1,6 @@ package com.bwie.common.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -20,19 +22,28 @@ import java.util.Date; @Builder @TableName("askrent") public class AskRent { - @TableId + @TableId(value = "askrent_id",type = IdType.AUTO) private Long askRentId; //求租ID + @TableField("askrent_address") private String askRentAddress; //求租具体地址 + @TableField("askrent_title") private String askRentTitle; //求租标签 + @TableField("dictionary_type_id") private Long dictionaryTypeId; //求租类型 + @TableField("addr_id") private Long addrId; //三级联动 + @TableField("user_id") private Long userId; //联系人 + @TableField("askrent_price") private BigDecimal askRentPrice; //求租价格 + @TableField("is_delete") private Long isDelete; //逻辑删除 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("create_time") private Date createTime; //创建时间 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("update_time") private Date updateTime; //修改时间 } diff --git a/bwie-common/src/main/java/com/bwie/common/domain/Group.java b/bwie-common/src/main/java/com/bwie/common/domain/Group.java index 4ea6472..00b8cec 100644 --- a/bwie-common/src/main/java/com/bwie/common/domain/Group.java +++ b/bwie-common/src/main/java/com/bwie/common/domain/Group.java @@ -18,6 +18,7 @@ import java.util.Date; @AllArgsConstructor @TableName("t_group") public class Group { + @TableId private Long groupId; //团购ID private String groupTitle; //团购标题 diff --git a/bwie-common/src/main/java/com/bwie/common/domain/request/AskBuyRequest.java b/bwie-common/src/main/java/com/bwie/common/domain/request/AskBuyRequest.java new file mode 100644 index 0000000..4c255a6 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/request/AskBuyRequest.java @@ -0,0 +1,25 @@ +package com.bwie.common.domain.request; + +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 求购搜索表 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class AskBuyRequest { + + + @TableField("dictionary_type_id") + private Long dictionaryTypeId; //求租类型 + + @TableField("addr_id") + private Long addrId; //三级联动 + +} diff --git a/bwie-common/src/main/java/com/bwie/common/domain/request/AskRentRequest.java b/bwie-common/src/main/java/com/bwie/common/domain/request/AskRentRequest.java new file mode 100644 index 0000000..a32bb8d --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/request/AskRentRequest.java @@ -0,0 +1,24 @@ +package com.bwie.common.domain.request; + +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 求租搜索表 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder + +public class AskRentRequest { + + @TableField("dictionary_type_id") + private Long dictionaryTypeId; //求租类型 + + @TableField("addr_id") + private Long addrId; //三级联动 +} diff --git a/bwie-common/src/main/java/com/bwie/common/domain/request/SeeHouseRequest.java b/bwie-common/src/main/java/com/bwie/common/domain/request/SeeHouseRequest.java index f6b6399..6fa5afb 100644 --- a/bwie-common/src/main/java/com/bwie/common/domain/request/SeeHouseRequest.java +++ b/bwie-common/src/main/java/com/bwie/common/domain/request/SeeHouseRequest.java @@ -7,6 +7,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; + @Data @Builder @NoArgsConstructor @@ -18,4 +19,4 @@ public class SeeHouseRequest { private Long userId;//用户ID private Long groupId;//团购ID--报名人数 private Long seeHouseStatus;//状态1.我要报名2.已报名 -} \ No newline at end of file +} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/EsAskBuyController.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/EsAskBuyController.java new file mode 100644 index 0000000..99f5065 --- /dev/null +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/EsAskBuyController.java @@ -0,0 +1,19 @@ +package com.bwie.ask.controller; + +import com.bwie.ask.seriver.EsAskBuyService; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * Es求购表 + */ +@RestController +@RequestMapping("/esBuy") +public class EsAskBuyController { + + private final EsAskBuyService esAskBuyService; + + public EsAskBuyController(EsAskBuyService esAskBuyService) { + this.esAskBuyService = esAskBuyService; + } +} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/EsAskRentController.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/EsAskRentController.java new file mode 100644 index 0000000..b5429ab --- /dev/null +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/EsAskRentController.java @@ -0,0 +1,19 @@ +package com.bwie.ask.controller; + +import com.bwie.ask.seriver.EsAskRentService; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * Es求租表 + */ +@RestController +@RequestMapping("/esRent") +public class EsAskRentController { + + private final EsAskRentService esAskRentService; + + public EsAskRentController(EsAskRentService esAskRentService) { + this.esAskRentService = esAskRentService; + } +} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/mapper/EsAskBuyMapper.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/mapper/EsAskBuyMapper.java new file mode 100644 index 0000000..8ef9ff3 --- /dev/null +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/mapper/EsAskBuyMapper.java @@ -0,0 +1,12 @@ +package com.bwie.ask.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bwie.common.domain.AskBuy; +import org.apache.ibatis.annotations.Mapper; + +/** + * Es求购同步表 + */ +@Mapper +public interface EsAskBuyMapper extends BaseMapper { +} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/mapper/EsAskRentMapper.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/mapper/EsAskRentMapper.java new file mode 100644 index 0000000..ef5daa2 --- /dev/null +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/mapper/EsAskRentMapper.java @@ -0,0 +1,20 @@ +package com.bwie.ask.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bwie.common.domain.AskBuy; +import com.bwie.common.domain.AskRent; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * Es求租同步表 + */ + +@Mapper +public interface EsAskRentMapper extends BaseMapper { + + + + +} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/EsAskBuyService.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/EsAskBuyService.java new file mode 100644 index 0000000..57c21b0 --- /dev/null +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/EsAskBuyService.java @@ -0,0 +1,8 @@ +package com.bwie.ask.seriver; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.bwie.common.domain.AskBuy; +import com.bwie.common.domain.AskRent; + +public interface EsAskBuyService extends IService { +} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/EsAskRentService.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/EsAskRentService.java new file mode 100644 index 0000000..d9835fd --- /dev/null +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/EsAskRentService.java @@ -0,0 +1,10 @@ +package com.bwie.ask.seriver; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.bwie.common.domain.AskBuy; +import com.bwie.common.domain.AskRent; + +public interface EsAskRentService extends IService { + + +} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/EsAskBuyServiceImpl.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/EsAskBuyServiceImpl.java new file mode 100644 index 0000000..e7d8de4 --- /dev/null +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/EsAskBuyServiceImpl.java @@ -0,0 +1,22 @@ +package com.bwie.ask.seriver.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bwie.ask.mapper.EsAskBuyMapper; +import com.bwie.ask.seriver.EsAskBuyService; +import com.bwie.common.domain.AskBuy; +import com.bwie.common.redis.RedisCache; +import org.springframework.stereotype.Service; +/** + * Es求购表 + */ +@Service +public class EsAskBuyServiceImpl extends ServiceImpl implements EsAskBuyService { + + private final RedisCache redisCache; + private final EsAskBuyMapper esAskBuyMapper; + + public EsAskBuyServiceImpl(RedisCache redisCache, EsAskBuyMapper esAskBuyMapper) { + this.redisCache = redisCache; + this.esAskBuyMapper = esAskBuyMapper; + } +} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/EsAskRentServiceImpl.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/EsAskRentServiceImpl.java new file mode 100644 index 0000000..f467f6a --- /dev/null +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/EsAskRentServiceImpl.java @@ -0,0 +1,24 @@ +package com.bwie.ask.seriver.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bwie.ask.mapper.EsAskRentMapper; +import com.bwie.ask.seriver.EsAskRentService; +import com.bwie.common.domain.AskRent; +import com.bwie.common.redis.RedisCache; +import org.springframework.stereotype.Service; +/** + * Es求租表 + */ +@Service +public class EsAskRentServiceImpl extends ServiceImpl implements EsAskRentService { + + + private final RedisCache redisCache; + + private final EsAskRentService esAskRentService; + + public EsAskRentServiceImpl(RedisCache redisCache, EsAskRentService esAskRentService) { + this.redisCache = redisCache; + this.esAskRentService = esAskRentService; + } +} diff --git a/bwie-modules/bwie-ask/src/main/resources/mapper/EsAskBuyMapper.xml b/bwie-modules/bwie-ask/src/main/resources/mapper/EsAskBuyMapper.xml new file mode 100644 index 0000000..cffbf9b --- /dev/null +++ b/bwie-modules/bwie-ask/src/main/resources/mapper/EsAskBuyMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/bwie-modules/bwie-ask/src/main/resources/mapper/EsAskRentMapper.xml b/bwie-modules/bwie-ask/src/main/resources/mapper/EsAskRentMapper.xml new file mode 100644 index 0000000..f356875 --- /dev/null +++ b/bwie-modules/bwie-ask/src/main/resources/mapper/EsAskRentMapper.xml @@ -0,0 +1,5 @@ + + + + + From 8cbbe2bce69b1c5e35a9989593268b65dbc35b6e Mon Sep 17 00:00:00 2001 From: Guo YuKun <1458871005@qq.com> Date: Sat, 23 Mar 2024 11:49:08 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=9B=B4=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/encodings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 5a6ca03..e70111a 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -12,6 +12,7 @@ +