Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/encodings.xml

.idea/encodings.xml

@@ -10,7 +10,6 @@
     <file url="file://$PROJECT_DIR$/bwie-modules/bwie-ask/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/bwie-modules/bwie-background/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/bwie-modules/bwie-background/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/bwie-modules/bwie-esask/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/bwie-modules/bwie-group/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/bwie-modules/bwie-group/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/bwie-modules/bwie-home/src/main/java" charset="UTF-8" />

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,36 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="TOP_LEVEL_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="INNER_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="METHOD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
+        </value>
+      </option>
+      <option name="FIELD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="IGNORE_DEPRECATED" value="false" />
+      <option name="IGNORE_JAVADOC_PERIOD" value="true" />
+      <option name="IGNORE_DUPLICATED_THROWS" value="false" />
+      <option name="IGNORE_POINT_TO_ITSELF" value="false" />
+      <option name="myAdditionalJavadocTags" value="date" />
+    </inspection_tool>
+  </profile>
+</component>

bwie-common/src/main/java/com/bwie/common/domain/CC.java

@@ -0,0 +1,4 @@
+package com.bwie.common.domain;
+
+public class CC {
+}

bwie-modules/bwie-group/src/main/java/com/bwie/group/GroupApp.java

@@ -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);
-    }
-}

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);
+    }
+}

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<Group> groupList(@RequestBody GroupRequest groupRequest){
+     return groupService.groupList(groupRequest);
+    }
+
+}

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<SeeHouse> seeList(@RequestBody Long userId){
+        return seeHouseService.seeList(userId);
+    }
+
+}

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<Group> groupList(GroupRequest groupRequest);
 }

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<SeeHouse> seeList(Long userId);
+}

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<Group> groupList(GroupRequest groupRequest);
+}

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<SeeHouse> seeList(Long userId);
+}

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<Group> groupList(GroupRequest groupRequest) {
+        PageHelper.startPage(groupRequest.getPageNum(),groupRequest.getPageSize());
+        List<Group> list = groupMapper.groupList(groupRequest);
+        PageInfo<Group> info = new PageInfo<>(list);
+
+//        Group build = Group.builder()
+//                .createTime(new Date("2020-10-01"))
+//                .build();
+        return info;
+    }
+
+}

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<SeeHouse> seeList(Long userId) {
+      return seeHouseMapper.seeList(userId);
+    }
+}

bwie-modules/bwie-group/src/main/resources/mapper/AskBuyRentFeign.xml

@@ -2,4 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bwie.group.mapper.GroupMapper">
 
+    <select id="groupList" resultType="com.bwie.common.domain.Group" parameterType="java.lang.Integer">
+        select * from t_group
+    </select>
 </mapper>

bwie-modules/bwie-group/src/main/resources/mapper/SeeHouseMapper.xml

@@ -0,0 +1,9 @@
+<?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.group.mapper.SeeHouseMapper">
+
+
+    <select id="seeList" resultType="com.bwie.common.domain.SeeHouse">
+        select * from t_see_house where user_id=#{userId}
+    </select>
+</mapper>

bwie-modules/pom.xml

@@ -17,8 +17,8 @@
     </modules>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>