Merge remote-tracking branch 'origin/master' into master

src/main/java/com/shigongli/common/BaseController.java

 package com.shigongli.common;
 
+import com.shigongli.constants.StatusConstant;
 import com.shigongli.entity.TaPerson;
 import com.shigongli.service.ITaPersonService;
 import org.springframework.beans.factory.annotation.Autowired;
         String token = JWTUtils.getToken(request);
         try {
             Map<String, Object> params = JWTUtils.decode(token);
-            String personId = params.get("personId").toString();
-            return iTaPersonService.getById(personId);
+            String personId = params.get("userId").toString();
+            TaPerson taPerson = iTaPersonService.getById(personId);
+
+            return null == taPerson || StatusConstant.DELETE.equals(taPerson.getStatus()) ? null : taPerson;
         } catch (Exception e) {
             e.printStackTrace();
             return null;

src/main/java/com/shigongli/controller/LoginController.java

             taPerson.setOpenid(sessionInfo.getOpenid());
             iTaPersonService.save(taPerson);
         }
+        taPerson.setSessionKey(sessionInfo.getSessionKey());
 
         // 生成 token
         Map<String, Object> claims = new HashMap<>();

src/main/java/com/shigongli/controller/TaHouseController.java

 import com.shigongli.common.BaseController;
 import com.shigongli.common.ResponseBean;
 import com.shigongli.constants.StatusConstant;
+import com.shigongli.entity.TaPerson;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import com.shigongli.entity.TaHouse;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 房源 前端控制器
 
 		    IPage<TaHouse> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaHouse> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("status", StatusConstant.NORMAL);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaHouse> result = iTaHouseService.page(pg, queryWrapper);
             return ResponseBean.success(result);
     }
 
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/ma/taHouse",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean houseList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                  @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                  HttpServletRequest request) throws Exception{
+
+        TaPerson taPerson = getPerson(request);
+        if (null == taPerson) {
+            return ResponseBean.error("数据错误, 校验当前人员出错", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        IPage<TaHouse> pg = new Page<>(pageNum, pageSize);
+        IPage<TaHouse> result = iTaHouseService.getHousesOfKeeper(pg, taPerson);
+        return ResponseBean.success(result);
+    }
+
+
     /**
      * 保存对象
      * @param taHouse 实体对象

src/main/java/com/shigongli/entity/TaPerson.java

 
     @TableField(exist = false)
     private String token;
+
+    @TableField(exist = false)
+    private String sessionKey;
 }

src/main/java/com/shigongli/mapper/TaHouseMapper.java

 package com.shigongli.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.shigongli.entity.TaHouse;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
 @Mapper
 public interface TaHouseMapper extends BaseMapper<TaHouse> {
 
+    IPage<TaHouse> getHousesOfKeeper(IPage<TaHouse> pg, @Param("personId") String personId);
 }

src/main/java/com/shigongli/service/ITaHouseService.java

 package com.shigongli.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.shigongli.entity.TaHouse;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.shigongli.entity.TaPerson;
 
 /**
  * <p>
  */
 public interface ITaHouseService extends IService<TaHouse> {
 
+    IPage<TaHouse> getHousesOfKeeper(IPage<TaHouse> pg, TaPerson taPerson);
 }

src/main/java/com/shigongli/service/impl/TaHouseServiceImpl.java

 package com.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.shigongli.entity.TaHouse;
+import com.shigongli.entity.TaPerson;
 import com.shigongli.mapper.TaHouseMapper;
 import com.shigongli.service.ITaHouseService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
 @Service
 public class TaHouseServiceImpl extends ServiceImpl<TaHouseMapper, TaHouse> implements ITaHouseService {
 
+    @Autowired
+    TaHouseMapper taHouseMapper;
+
+    @Override
+    public IPage<TaHouse> getHousesOfKeeper(IPage<TaHouse> pg, TaPerson taPerson) {
+
+        return taHouseMapper.getHousesOfKeeper(pg, taPerson.getPersonId());
+    }
 }

src/main/resources/mapper/TaHouseMapper.xml

 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.shigongli.mapper.TaHouseMapper">
 
+    <select id="getHousesOfKeeper" resultType="com.shigongli.entity.TaHouse">
+        SELECT
+            t.*
+        FROM
+            ta_house t
+        INNER JOIN ta_shop_keeper s ON t.shop_id = s.shop_id
+        WHERE
+            s.person_id = #{personId}
+            AND s.`status` = 1
+            AND t.`status` = 1
+    </select>
 </mapper>