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..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 @@ -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; @@ -6,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; @@ -17,15 +19,17 @@ import java.util.Date; @AllArgsConstructor @NoArgsConstructor @Builder +@TableName("askbuy") public class AskBuy { - private BigInteger askBuyId; //求租ID + @TableId + 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 9b69995..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 @@ -1,11 +1,14 @@ 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.math.BigInteger; + +import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.Date; /** @@ -15,15 +18,17 @@ import java.util.Date; @AllArgsConstructor @NoArgsConstructor @Builder +@TableName("askrent") public class AskRent { - private BigInteger askRentId; //求租ID + @TableId + 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 f37b627..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,6 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import org.springframework.format.annotation.DateTimeFormat; + 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/AskApp.java similarity index 70% 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/AskApp.java index c20f5b1..acaf2f3 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/AskApp.java @@ -1,15 +1,14 @@ -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") -public class AskMapperApp { +@MapperScan("com.bwie.ask.mapper") +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/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..e4abe23 --- /dev/null +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/AskRentController.java @@ -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> 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/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 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 @@ +