diff --git a/.idea/encodings.xml b/.idea/encodings.xml index b929e54..b1b90ca 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -7,14 +7,8 @@ - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..6560a98 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,36 @@ + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /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/domain/Group.java b/bwie-common/src/main/java/com/bwie/common/domain/Group.java new file mode 100644 index 0000000..f4de836 --- /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.IdType; +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(type = IdType.AUTO) + 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..2f432b2 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/SeeHouse.java @@ -0,0 +1,24 @@ +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.io.Serializable; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@TableName("t_see_house") +public class SeeHouse implements Serializable { + @TableId(type = IdType.AUTO) + private Integer seeHouseId;//团购看房ID + private Integer userId;//用户ID + private Integer groupId;//团购ID--报名人数 + private Integer seeHouseStatus;//状态1.我要报名2.已报名 +} 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 index 416fcd3..f42cd1d 100644 --- a/bwie-common/src/main/java/com/bwie/common/domain/User.java +++ b/bwie-common/src/main/java/com/bwie/common/domain/User.java @@ -1,13 +1,31 @@ package com.bwie.common.domain; +import com.baomidou.mybatisplus.annotation.IdType; +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 @AllArgsConstructor @NoArgsConstructor +@TableName("user") public class User { + @TableId(type = IdType.AUTO) + private Long messageId; + private Long userId; + private Long brokerId; + private Long houseId; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date messageStartDate; + private String messageTest; + private Long messageStatus; + private Long idDeleted; } 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..93bc4ac --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/request/GroupRequest.java @@ -0,0 +1,53 @@ +package com.bwie.common.domain.request; + +import com.baomidou.mybatisplus.annotation.IdType; +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(type = IdType.AUTO) + 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; + + private Integer pageNum=5; + private Integer pageSize=10; +} 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..13c23e0 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/domain/request/SeeHouseRequest.java @@ -0,0 +1,28 @@ +package com.bwie.common.domain.request; + +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.io.Serializable; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@TableName("t_see_house") +public class SeeHouseRequest implements Serializable { + @TableId(type = IdType.AUTO) + private Long seeHouseId;//团购看房ID + private Long userId;//用户ID + private Long groupId;//团购ID--报名人数 + private Long seeHouseStatus;//状态1.我要报名2.已报名 + + + private Integer pageNum=5; + private Integer pageSize=10; +} \ No newline at end of file diff --git a/bwie-modules/bwie-group/src/main/java/com/bwie/group/GroupApp.java b/bwie-modules/bwie-group/src/main/java/com/bwie/group/GroupApp.java deleted file mode 100644 index 13358bb..0000000 --- a/bwie-modules/bwie-group/src/main/java/com/bwie/group/GroupApp.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.bwie.group; - -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.openfeign.EnableFeignClients; - -@SpringBootApplication -@EnableDiscoveryClient -@MapperScan("com.bwie.group.mapper") -public class GroupApp { - public static void main(String[] args) { - SpringApplication.run(GroupApp.class); - } -} diff --git a/bwie-modules/bwie-group/src/main/java/com/bwie/group/GroupApplication.java b/bwie-modules/bwie-group/src/main/java/com/bwie/group/GroupApplication.java new file mode 100644 index 0000000..73b7a56 --- /dev/null +++ b/bwie-modules/bwie-group/src/main/java/com/bwie/group/GroupApplication.java @@ -0,0 +1,11 @@ +package com.bwie.group; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class GroupApplication { + public static void main(String[] args) { + SpringApplication.run(GroupApplication.class); + } +} diff --git a/bwie-modules/bwie-group/src/main/java/com/bwie/group/controller/GroupController.java b/bwie-modules/bwie-group/src/main/java/com/bwie/group/controller/GroupController.java new file mode 100644 index 0000000..412b594 --- /dev/null +++ b/bwie-modules/bwie-group/src/main/java/com/bwie/group/controller/GroupController.java @@ -0,0 +1,22 @@ +package com.bwie.group.controller; + +import com.bwie.common.domain.Group; +import com.bwie.common.domain.request.GroupRequest; +import com.bwie.group.service.GroupService; +import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +@RestController +@RequestMapping("/group") +public class GroupController { + @Autowired + private GroupService groupService; + + @PostMapping("/groupList") + public PageInfo groupList(@RequestBody GroupRequest groupRequest){ + return groupService.groupList(groupRequest); + } + +} diff --git a/bwie-modules/bwie-group/src/main/java/com/bwie/group/controller/SeeHouseController.java b/bwie-modules/bwie-group/src/main/java/com/bwie/group/controller/SeeHouseController.java new file mode 100644 index 0000000..be4f19e --- /dev/null +++ b/bwie-modules/bwie-group/src/main/java/com/bwie/group/controller/SeeHouseController.java @@ -0,0 +1,24 @@ +package com.bwie.group.controller; + +import com.bwie.common.domain.SeeHouse; +import com.bwie.group.service.SeeHouseService; +import org.springframework.beans.factory.annotation.Autowired; +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; + +@RestController +@RequestMapping("/seeHouse") +public class SeeHouseController { + @Autowired + private SeeHouseService seeHouseService; + + @PostMapping("/seeList") + public List seeList(@RequestBody Long userId){ + return seeHouseService.seeList(userId); + } + +} diff --git a/bwie-modules/bwie-group/src/main/java/com/bwie/group/mapper/GroupMapper.java b/bwie-modules/bwie-group/src/main/java/com/bwie/group/mapper/GroupMapper.java index 9edf88c..a344c9b 100644 --- a/bwie-modules/bwie-group/src/main/java/com/bwie/group/mapper/GroupMapper.java +++ b/bwie-modules/bwie-group/src/main/java/com/bwie/group/mapper/GroupMapper.java @@ -1,4 +1,11 @@ package com.bwie.group.mapper; +import com.bwie.common.domain.Group; +import com.bwie.common.domain.request.GroupRequest; +import org.apache.ibatis.annotations.Mapper; +import java.util.List; + +@Mapper public interface GroupMapper { + List groupList(GroupRequest groupRequest); } diff --git a/bwie-modules/bwie-group/src/main/java/com/bwie/group/mapper/SeeHouseMapper.java b/bwie-modules/bwie-group/src/main/java/com/bwie/group/mapper/SeeHouseMapper.java new file mode 100644 index 0000000..3a6f66b --- /dev/null +++ b/bwie-modules/bwie-group/src/main/java/com/bwie/group/mapper/SeeHouseMapper.java @@ -0,0 +1,11 @@ +package com.bwie.group.mapper; + +import com.bwie.common.domain.SeeHouse; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface SeeHouseMapper { + List seeList(Long userId); +} diff --git a/bwie-modules/bwie-group/src/main/java/com/bwie/group/service/GroupService.java b/bwie-modules/bwie-group/src/main/java/com/bwie/group/service/GroupService.java new file mode 100644 index 0000000..7e0a290 --- /dev/null +++ b/bwie-modules/bwie-group/src/main/java/com/bwie/group/service/GroupService.java @@ -0,0 +1,10 @@ +package com.bwie.group.service; + +import com.bwie.common.domain.Group; +import com.bwie.common.domain.request.GroupRequest; +import com.github.pagehelper.PageInfo; + +public interface GroupService { + //分页团购列表 + PageInfo groupList(GroupRequest groupRequest); +} diff --git a/bwie-modules/bwie-group/src/main/java/com/bwie/group/service/SeeHouseService.java b/bwie-modules/bwie-group/src/main/java/com/bwie/group/service/SeeHouseService.java new file mode 100644 index 0000000..9c94c72 --- /dev/null +++ b/bwie-modules/bwie-group/src/main/java/com/bwie/group/service/SeeHouseService.java @@ -0,0 +1,10 @@ +package com.bwie.group.service; + +import com.bwie.common.domain.SeeHouse; + +import java.util.List; + +public interface SeeHouseService { +// 用户看房团购 + List seeList(Long userId); +} diff --git a/bwie-modules/bwie-group/src/main/java/com/bwie/group/service/impl/GroupServiceImpl.java b/bwie-modules/bwie-group/src/main/java/com/bwie/group/service/impl/GroupServiceImpl.java new file mode 100644 index 0000000..e39b978 --- /dev/null +++ b/bwie-modules/bwie-group/src/main/java/com/bwie/group/service/impl/GroupServiceImpl.java @@ -0,0 +1,31 @@ +package com.bwie.group.service.impl; + +import com.bwie.common.domain.Group; +import com.bwie.common.domain.request.GroupRequest; +import com.bwie.group.mapper.GroupMapper; +import com.bwie.group.service.GroupService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class GroupServiceImpl implements GroupService { + @Autowired + private GroupMapper groupMapper; + + @Override + public PageInfo groupList(GroupRequest groupRequest) { + PageHelper.startPage(groupRequest.getPageNum(),groupRequest.getPageSize()); + List list = groupMapper.groupList(groupRequest); + PageInfo info = new PageInfo<>(list); + +// Group build = Group.builder() +// .createTime(new Date("2020-10-01")) +// .build(); + return info; + } + +} diff --git a/bwie-modules/bwie-group/src/main/java/com/bwie/group/service/impl/SeeHouseServiceImpl.java b/bwie-modules/bwie-group/src/main/java/com/bwie/group/service/impl/SeeHouseServiceImpl.java new file mode 100644 index 0000000..d27b227 --- /dev/null +++ b/bwie-modules/bwie-group/src/main/java/com/bwie/group/service/impl/SeeHouseServiceImpl.java @@ -0,0 +1,19 @@ +package com.bwie.group.service.impl; + +import com.bwie.common.domain.SeeHouse; +import com.bwie.group.mapper.SeeHouseMapper; +import com.bwie.group.service.SeeHouseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class SeeHouseServiceImpl implements SeeHouseService { + @Autowired + private SeeHouseMapper seeHouseMapper; + @Override + public List seeList(Long userId) { + return seeHouseMapper.seeList(userId); + } +} diff --git a/bwie-modules/bwie-group/src/main/resources/mapper/GroupMapper.xml b/bwie-modules/bwie-group/src/main/resources/mapper/GroupMapper.xml index dbb455a..87c4fde 100644 --- a/bwie-modules/bwie-group/src/main/resources/mapper/GroupMapper.xml +++ b/bwie-modules/bwie-group/src/main/resources/mapper/GroupMapper.xml @@ -2,4 +2,7 @@ + diff --git a/bwie-modules/bwie-group/src/main/resources/mapper/SeeHouseMapper.xml b/bwie-modules/bwie-group/src/main/resources/mapper/SeeHouseMapper.xml new file mode 100644 index 0000000..5c680ce --- /dev/null +++ b/bwie-modules/bwie-group/src/main/resources/mapper/SeeHouseMapper.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/bwie-modules/bwie-system/src/main/resources/mapper/SysMapper.xml b/bwie-modules/bwie-system/src/main/resources/mapper/SeeHouseMapper.xml similarity index 100% rename from bwie-modules/bwie-system/src/main/resources/mapper/SysMapper.xml rename to bwie-modules/bwie-system/src/main/resources/mapper/SeeHouseMapper.xml diff --git a/bwie-modules/pom.xml b/bwie-modules/pom.xml index 5e61532..2006bf4 100644 --- a/bwie-modules/pom.xml +++ b/bwie-modules/pom.xml @@ -17,8 +17,8 @@ - 17 - 17 + 8 + 8 UTF-8