Merge remote-tracking branch 'origin/master'
# Conflicts: # .idea/encodings.xml # .idea/uiDesigner.xml # bwie-common/src/main/java/com/bwie/common/domain/Group.java # bwie-common/src/main/java/com/bwie/common/domain/SeeHouse.java # bwie-common/src/main/java/com/bwie/common/domain/User.java # bwie-common/src/main/java/com/bwie/common/domain/request/GroupRequest.java # bwie-common/src/main/java/com/bwie/common/domain/request/SeeHouseRequest.javamaster
commit
78a05d0ea1
|
@ -2,121 +2,121 @@
|
|||
<project version="4">
|
||||
<component name="Palette2">
|
||||
<group name="Swing">
|
||||
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
|
||||
</item>
|
||||
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
|
||||
</item>
|
||||
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
|
||||
</item>
|
||||
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
|
||||
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
|
||||
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
|
||||
</item>
|
||||
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
|
||||
<initial-values>
|
||||
<property name="text" value="Button" />
|
||||
</initial-values>
|
||||
</item>
|
||||
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
||||
<initial-values>
|
||||
<property name="text" value="RadioButton" />
|
||||
</initial-values>
|
||||
</item>
|
||||
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
||||
<initial-values>
|
||||
<property name="text" value="CheckBox" />
|
||||
</initial-values>
|
||||
</item>
|
||||
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
|
||||
<initial-values>
|
||||
<property name="text" value="Label" />
|
||||
</initial-values>
|
||||
</item>
|
||||
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||
<preferred-size width="150" height="-1" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||
<preferred-size width="150" height="-1" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||
<preferred-size width="150" height="-1" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||
<preferred-size width="150" height="50" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||
<preferred-size width="150" height="50" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||
<preferred-size width="150" height="50" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
|
||||
</item>
|
||||
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||
<preferred-size width="150" height="50" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
|
||||
<preferred-size width="150" height="50" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||
<preferred-size width="150" height="50" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
||||
<preferred-size width="200" height="200" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
||||
<preferred-size width="200" height="200" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
||||
</item>
|
||||
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
||||
</item>
|
||||
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
|
||||
</item>
|
||||
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
|
||||
</item>
|
||||
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
|
||||
<preferred-size width="-1" height="20" />
|
||||
</default-constraints>
|
||||
</item>
|
||||
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
|
||||
</item>
|
||||
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
|
||||
</item>
|
||||
</group>
|
||||
|
|
|
@ -0,0 +1,50 @@
|
|||
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;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 求购表
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Builder
|
||||
@TableName("askbuy")
|
||||
public class AskBuy {
|
||||
@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; //修改时间
|
||||
}
|
|
@ -0,0 +1,49 @@
|
|||
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;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.Date;
|
||||
/**
|
||||
* 求租表
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Builder
|
||||
@TableName("askrent")
|
||||
public class AskRent {
|
||||
@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; //修改时间
|
||||
}
|
|
@ -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; //字典类型
|
||||
|
||||
}
|
|
@ -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; //具体类型
|
||||
|
||||
}
|
|
@ -1,6 +1,5 @@
|
|||
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;
|
||||
|
@ -10,6 +9,7 @@ import lombok.Data;
|
|||
import lombok.NoArgsConstructor;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
|
@ -18,7 +18,8 @@ import java.util.Date;
|
|||
@AllArgsConstructor
|
||||
@TableName("t_group")
|
||||
public class Group {
|
||||
@TableId(type = IdType.AUTO)
|
||||
|
||||
@TableId
|
||||
private Long groupId; //团购ID
|
||||
private String groupTitle; //团购标题
|
||||
private String groupImage; //图片
|
||||
|
@ -48,3 +49,4 @@ public class Group {
|
|||
private Date updateTime; //修改时间
|
||||
private Long isDelete;
|
||||
}
|
||||
|
||||
|
|
|
@ -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; //逻辑删除字段
|
||||
|
||||
}
|
|
@ -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驳回
|
||||
}
|
|
@ -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; //图片地址
|
||||
}
|
|
@ -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; //房产发布类型名称
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
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;
|
||||
|
@ -8,17 +8,15 @@ 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.已报名
|
||||
public class SeeHouse {
|
||||
@TableId
|
||||
private Long seeHouseId;//团购看房ID
|
||||
private Long userId;//用户ID
|
||||
private Long groupId;//团购ID--报名人数
|
||||
private Long seeHouseStatus;//状态1.我要报名2.已报名
|
||||
}
|
||||
|
|
|
@ -1,31 +0,0 @@
|
|||
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;
|
||||
}
|
|
@ -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; //三级联动
|
||||
|
||||
}
|
|
@ -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; //三级联动
|
||||
}
|
|
@ -1,6 +1,5 @@
|
|||
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;
|
||||
|
@ -18,7 +17,7 @@ import java.util.Date;
|
|||
@AllArgsConstructor
|
||||
@TableName("t_group")
|
||||
public class GroupRequest {
|
||||
@TableId(type = IdType.AUTO)
|
||||
@TableId
|
||||
private Long groupId; //团购ID
|
||||
private String groupTitle; //团购标题
|
||||
private String groupImage; //图片
|
||||
|
@ -47,7 +46,4 @@ public class GroupRequest {
|
|||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date updateTime; //修改时间
|
||||
private Long isDelete;
|
||||
|
||||
private Integer pageNum=5;
|
||||
private Integer pageSize=10;
|
||||
}
|
||||
|
|
|
@ -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-未验真】
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
|
@ -1,6 +1,5 @@
|
|||
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;
|
||||
|
@ -8,21 +7,16 @@ 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)
|
||||
public class SeeHouseRequest {
|
||||
@TableId
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,63 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>com.bwie</groupId>
|
||||
<artifactId>house_project</artifactId>
|
||||
<version>1.0.0</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>bwie-ask</artifactId>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>8</maven.compiler.source>
|
||||
<maven.compiler.target>8</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
<dependencies>
|
||||
<!-- 系统公共 依赖 -->
|
||||
<dependency>
|
||||
<groupId>com.bwie</groupId>
|
||||
<artifactId>bwie-common</artifactId>
|
||||
</dependency>
|
||||
<!-- SpringBoot Web-->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-web</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Druid -->
|
||||
<dependency>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>druid-spring-boot-starter</artifactId>
|
||||
<version>1.2.8</version>
|
||||
</dependency>
|
||||
<!-- Mysql Connector -->
|
||||
<dependency>
|
||||
<groupId>mysql</groupId>
|
||||
<artifactId>mysql-connector-java</artifactId>
|
||||
</dependency>
|
||||
<!-- Mybatis 依赖配置 -->
|
||||
<dependency>
|
||||
<groupId>org.mybatis.spring.boot</groupId>
|
||||
<artifactId>mybatis-spring-boot-starter</artifactId>
|
||||
<version>2.2.2</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Pagehelper -->
|
||||
<dependency>
|
||||
<groupId>com.github.pagehelper</groupId>
|
||||
<artifactId>pagehelper-spring-boot-starter</artifactId>
|
||||
<version>1.4.1</version>
|
||||
</dependency>
|
||||
<!-- test -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
|
@ -0,0 +1,14 @@
|
|||
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.ask.mapper")
|
||||
public class AskApp {
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(AskApp.class);
|
||||
}
|
||||
}
|
|
@ -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<List<AskBuy>> shouAll(){
|
||||
return askBuyService.shouAll();
|
||||
}
|
||||
|
||||
@PostMapping("/addAskBuy")
|
||||
public Result addAskBuy(@RequestBody AskBuy askBuy){
|
||||
return askBuyService.addAskBuy(askBuy);
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,29 @@
|
|||
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;
|
||||
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<List<AskRent>> shouList(){
|
||||
return askRentService.shouList();
|
||||
}
|
||||
@PostMapping("/addAskRent")
|
||||
public Result addAskRent(@RequestBody AskRent askRent){
|
||||
return askRentService.addAskRent(askRent);
|
||||
}
|
||||
}
|
|
@ -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;
|
||||
}
|
||||
}
|
|
@ -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;
|
||||
}
|
||||
}
|
|
@ -0,0 +1,22 @@
|
|||
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层
|
||||
*/
|
||||
@Mapper
|
||||
public interface AskBuyMapper extends BaseMapper<AskBuy> {
|
||||
|
||||
|
||||
List<AskBuy> shouAll();
|
||||
|
||||
|
||||
Integer addAskBuy(AskBuy askBuy);
|
||||
|
||||
|
||||
}
|
|
@ -0,0 +1,18 @@
|
|||
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<AskRent> {
|
||||
List<AskRent> shouList();
|
||||
|
||||
Integer addAskRent(AskRent askRent);
|
||||
|
||||
}
|
|
@ -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<AskBuy> {
|
||||
}
|
|
@ -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<AskRent> {
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
|
@ -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<AskBuy> {
|
||||
|
||||
|
||||
public Result<List<AskBuy>> shouAll();
|
||||
|
||||
public Result addAskBuy(AskBuy askBuy);
|
||||
}
|
|
@ -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<AskRent> {
|
||||
|
||||
public Result<List<AskRent>> shouList();
|
||||
|
||||
public Result addAskRent(AskRent askRent);
|
||||
}
|
|
@ -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<AskBuy> {
|
||||
}
|
|
@ -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<AskRent> {
|
||||
|
||||
|
||||
}
|
|
@ -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<AskBuyMapper, AskBuy> implements AskBuyService {
|
||||
|
||||
|
||||
private final AskBuyMapper askBuyMapper;
|
||||
|
||||
|
||||
public AskBuyServiceImpl(AskBuyMapper askBuyMapper) {
|
||||
this.askBuyMapper = askBuyMapper;
|
||||
}
|
||||
|
||||
/**
|
||||
* 求购的普通链表
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public Result<List<AskBuy>> shouAll(){
|
||||
List<AskBuy> 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?"发表成功!!!!":"发表失败!!!!");
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
|
@ -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<AskRentMapper, AskRent> implements AskRentService {
|
||||
|
||||
private final AskRentMapper askRentMapper;
|
||||
|
||||
public AskRentServiceImpl(AskRentMapper askRentMapper) {
|
||||
this.askRentMapper = askRentMapper;
|
||||
}
|
||||
|
||||
/**
|
||||
* 求租的普通链表
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public Result<List<AskRent>> shouList(){
|
||||
List<AskRent> 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?"发表成功!!!!":"发表失败!!!!");
|
||||
}
|
||||
|
||||
}
|
|
@ -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<EsAskBuyMapper, AskBuy> implements EsAskBuyService {
|
||||
|
||||
private final RedisCache redisCache;
|
||||
private final EsAskBuyMapper esAskBuyMapper;
|
||||
|
||||
public EsAskBuyServiceImpl(RedisCache redisCache, EsAskBuyMapper esAskBuyMapper) {
|
||||
this.redisCache = redisCache;
|
||||
this.esAskBuyMapper = esAskBuyMapper;
|
||||
}
|
||||
}
|
|
@ -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<EsAskRentMapper, AskRent> implements EsAskRentService {
|
||||
|
||||
|
||||
private final RedisCache redisCache;
|
||||
|
||||
private final EsAskRentService esAskRentService;
|
||||
|
||||
public EsAskRentServiceImpl(RedisCache redisCache, EsAskRentService esAskRentService) {
|
||||
this.redisCache = redisCache;
|
||||
this.esAskRentService = esAskRentService;
|
||||
}
|
||||
}
|
|
@ -0,0 +1,30 @@
|
|||
# Tomcat
|
||||
server:
|
||||
port: 9003
|
||||
# Spring
|
||||
spring:
|
||||
main:
|
||||
allow-circular-references: true
|
||||
allow-bean-definition-overriding: true
|
||||
jackson:
|
||||
date-format: yyyy-MM-dd HH:mm:ss
|
||||
time-zone: GMT+8
|
||||
application:
|
||||
# 应用名称
|
||||
name: bwie-ask
|
||||
profiles:
|
||||
# 环境配置
|
||||
active: dev
|
||||
cloud:
|
||||
nacos:
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 124.221.177.197:8848
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 124.221.177.197:8848
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
shared-configs:
|
||||
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.bwie.ask.mapper.AskBuyMapper">
|
||||
|
||||
|
||||
<insert id="addAskBuy">
|
||||
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});
|
||||
</insert>
|
||||
|
||||
<select id="shouAll" resultType="com.bwie.common.domain.AskBuy">
|
||||
select * from askbuy
|
||||
</select>
|
||||
</mapper>
|
|
@ -0,0 +1,13 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.bwie.ask.mapper.AskRentMapper">
|
||||
<insert id="addAskRent">
|
||||
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});
|
||||
</insert>
|
||||
|
||||
<select id="shouList" resultType="com.bwie.common.domain.AskRent">
|
||||
select * from askrent
|
||||
</select>
|
||||
</mapper>
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.bwie.ask.mapper.EsAskBuyMapper">
|
||||
|
||||
</mapper>
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.bwie.ask.mapper.EsAskRentMapper">
|
||||
|
||||
</mapper>
|
|
@ -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.background.mapper")
|
||||
public class BackgroundApp {
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(BackgroundApp.class);
|
||||
}
|
||||
}
|
|
@ -0,0 +1,4 @@
|
|||
package com.bwie.background.controller;
|
||||
|
||||
public class BackGroundController {
|
||||
}
|
|
@ -0,0 +1,13 @@
|
|||
package com.bwie.background.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* 后台mapper层
|
||||
*/
|
||||
@Mapper
|
||||
public interface BackGroundMapper{
|
||||
|
||||
|
||||
}
|
|
@ -0,0 +1,4 @@
|
|||
package com.bwie.background.seriver;
|
||||
|
||||
public interface BackGroundService {
|
||||
}
|
|
@ -0,0 +1,13 @@
|
|||
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 {
|
||||
}
|
|
@ -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
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.bwie.background.mapper.AskBuyMapper">
|
||||
|
||||
</mapper>
|
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.bwie.background.mapper.AskRentMapper">
|
||||
|
||||
<select id="shouList" resultType="com.bwie.common.domain.AskRent"></select>
|
||||
</mapper>
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.bwie.background.mapper.BackGroundMapper">
|
||||
|
||||
</mapper>
|
|
@ -0,0 +1,63 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>com.bwie</groupId>
|
||||
<artifactId>house_project</artifactId>
|
||||
<version>1.0.0</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>bwie-home</artifactId>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>8</maven.compiler.source>
|
||||
<maven.compiler.target>8</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
<dependencies>
|
||||
<!-- 系统公共 依赖 -->
|
||||
<dependency>
|
||||
<groupId>com.bwie</groupId>
|
||||
<artifactId>bwie-common</artifactId>
|
||||
</dependency>
|
||||
<!-- SpringBoot Web-->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-web</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Druid -->
|
||||
<dependency>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>druid-spring-boot-starter</artifactId>
|
||||
<version>1.2.8</version>
|
||||
</dependency>
|
||||
<!-- Mysql Connector -->
|
||||
<dependency>
|
||||
<groupId>mysql</groupId>
|
||||
<artifactId>mysql-connector-java</artifactId>
|
||||
</dependency>
|
||||
<!-- Mybatis 依赖配置 -->
|
||||
<dependency>
|
||||
<groupId>org.mybatis.spring.boot</groupId>
|
||||
<artifactId>mybatis-spring-boot-starter</artifactId>
|
||||
<version>2.2.2</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Pagehelper -->
|
||||
<dependency>
|
||||
<groupId>com.github.pagehelper</groupId>
|
||||
<artifactId>pagehelper-spring-boot-starter</artifactId>
|
||||
<version>1.4.1</version>
|
||||
</dependency>
|
||||
<!-- test -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
|
@ -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);
|
||||
}
|
||||
}
|
|
@ -0,0 +1,4 @@
|
|||
package com.bwie.home.controller;
|
||||
|
||||
public class HomeController {
|
||||
}
|
|
@ -0,0 +1,4 @@
|
|||
package com.bwie.home.mapper;
|
||||
|
||||
public interface HomeMapper {
|
||||
}
|
|
@ -0,0 +1,4 @@
|
|||
package com.bwie.home.service;
|
||||
|
||||
public interface HomeService {
|
||||
}
|
|
@ -0,0 +1,4 @@
|
|||
package com.bwie.home.service;
|
||||
|
||||
public class HomeServiceImpl {
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.bwie.home.mapper.HomeMapper">
|
||||
|
||||
</mapper>
|
|
@ -58,5 +58,11 @@
|
|||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mybatis</groupId>
|
||||
<artifactId>mybatis-spring</artifactId>
|
||||
<version>2.1.1</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
package com.bwie.system.mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface SysMapper {
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue