Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

src/main/java/com/huiju/estateagents/controller/TaChannelController.java

@@ -0,0 +1,170 @@
+package com.huiju.estateagents.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaChannel;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.TaChannelService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+    *   前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-17
+ */
+@RestController
+@RequestMapping("/api")
+public class TaChannelController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaChannelController.class);
+
+    @Autowired
+    public TaChannelService taChannelService;
+
+    @Autowired
+    public ITaPersonService taPersonService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/channel",method= RequestMethod.GET)
+    public ResponseBean channelList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaChannel> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaChannel> result = taChannelService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param channel 实体对象
+     * @return
+     */
+    @RequestMapping(value="/channel",method= RequestMethod.POST)
+    public ResponseBean channelAdd(@RequestBody TaChannel channel){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (taChannelService.save(channel)){
+                responseBean.addSuccess(channel);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/channel/{id}", method= RequestMethod.DELETE)
+    public ResponseBean channelDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(taChannelService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param channel 实体对象
+     * @return
+     */
+    @RequestMapping(value="/channel/{id}",method= RequestMethod.PUT)
+    public ResponseBean channelUpdate(@PathVariable Integer id,
+                                        @RequestBody TaChannel channel){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (taChannelService.updateById(channel)){
+                responseBean.addSuccess(channel);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/channel/{id}",method= RequestMethod.GET)
+    public ResponseBean channelGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(taChannelService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 渠道管理下的经纪人
+     */
+    @RequestMapping(value="/channel/broker",method= RequestMethod.GET)
+    public  ResponseBean channelBrokerList(@RequestBody String  Param,
+                                           @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        JSONObject jSONObject = JSONObject.parseObject(Param);
+        String name = jSONObject.getString("name");
+        String phone = jSONObject.getString("phone");
+        ResponseBean taPerson =  taPersonService.channelBrokerList(name,phone,pageNum,pageSize);
+        return taPerson;
+    }
+}

src/main/java/com/huiju/estateagents/controller/TaChannelPersonController.java

@@ -0,0 +1,151 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaChannelPerson;
+import com.huiju.estateagents.service.TaChannelPersonService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    *   前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-17
+ */
+@RestController
+@RequestMapping("/api")
+public class TaChannelPersonController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaChannelPersonController.class);
+
+    @Autowired
+    public TaChannelPersonService iChannelPersonService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/channelPerson",method= RequestMethod.GET)
+    public ResponseBean channelPersonList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          @RequestParam(value = "channelName",required = false)String channelName  ){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaChannelPerson> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaChannelPerson> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("channel_name",channelName);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaChannelPerson> result = iChannelPersonService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelPersonList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param channelPerson 实体对象
+     * @return
+     */
+    @RequestMapping(value="/channelPerson",method= RequestMethod.POST)
+    public ResponseBean channelPersonAdd(@RequestBody TaChannelPerson channelPerson){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iChannelPersonService.save(channelPerson)){
+                responseBean.addSuccess(channelPerson);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelPersonAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/channelPerson/{id}", method= RequestMethod.DELETE)
+    public ResponseBean channelPersonDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iChannelPersonService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelPersonDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param channelPerson 实体对象
+     * @return
+     */
+    @RequestMapping(value="/channelPerson/{id}",method= RequestMethod.PUT)
+    public ResponseBean channelPersonUpdate(@PathVariable Integer id,
+                                        @RequestBody TaChannelPerson channelPerson){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iChannelPersonService.updateById(channelPerson)){
+                responseBean.addSuccess(channelPerson);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelPersonUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/channelPerson/{id}",method= RequestMethod.GET)
+    public ResponseBean channelPersonGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iChannelPersonService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelPersonDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java

@@ -199,7 +199,9 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                          @RequestParam(value ="entryType",required = false) String entryType,
                                          @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
-                                         @RequestParam(value = "sex",required = false)Integer sex){
+                                         @RequestParam(value = "sex",required = false)Integer sex, HttpServletRequest request){
+        String personId = JWTUtils.getSubject(request);
+        TaPerson taPerson = taPersonService.getById(personId);
         try{
             return ResponseBean.success(taRecommendCustomerService.getRepCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex));
         }catch (Exception e){

src/main/java/com/huiju/estateagents/entity/TaChannel.java

@@ -0,0 +1,85 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ *  
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_channel")
+public class TaChannel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 渠道id
+     */
+    @TableId(value = "channel_id", type = IdType.AUTO)
+    private Integer channelId;
+
+    /**
+     * 渠道名称
+     */
+    private String channelName;
+
+    /**
+     * 渠道唯一识别码
+     */
+    private String channelCode;
+
+    /**
+     * 渠道联系人
+     */
+    private String channelContact;
+
+    /**
+     * 联系电话
+     */
+    private String contactTel;
+
+    /**
+     * 经纪人数
+     */
+    private Integer agentsNum;
+
+    /**
+     * 有效推荐数
+     */
+    private Integer recommendEffective;
+
+    /**
+     * 邀请经纪人数
+     */
+    private Integer agentsInvite;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+
+}

src/main/java/com/huiju/estateagents/entity/TaChannelPerson.java

@@ -0,0 +1,42 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ *  
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_channel_person")
+public class TaChannelPerson implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 人员id
+     */
+    private String personId;
+
+    /**
+     * 渠道id
+     */
+    private Integer channelId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com/huiju/estateagents/mapper/TaChannelMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaChannel;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *   Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-17
+ */
+@Mapper
+public interface TaChannelMapper extends BaseMapper<TaChannel> {
+
+}

src/main/java/com/huiju/estateagents/mapper/TaChannelPersonMapper.java

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaChannelPerson;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *   Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-17
+ */
+@Mapper
+public interface TaChannelPersonMapper extends BaseMapper<TaChannelPerson> {
+
+}

src/main/java/com/huiju/estateagents/mapper/TaPersonMapper.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TaChannel;
 import com.huiju.estateagents.entity.TaPerson;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.po.PersonPO;
@@ -162,5 +163,12 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     IPage<TaPerson> getPersonList(IPage<TaPerson> page, @Param("personType")String personType, @Param("name") String name, @Param("phone") String phone,@Param("status") Integer status,@Param("buildingId") String buildingId,@Param("personTags") String personTags);
 
-
+    /**
+     * 渠道下的经纪人
+     * @param pg
+     * @param name
+     * @param phone
+     * @return
+     */
+    IPage<TaPerson> channelBrokerList(IPage<TaChannel> pg, @Param("name") String name, @Param("phone") String phone);
 }

src/main/java/com/huiju/estateagents/service/ITaPersonService.java

@@ -62,4 +62,12 @@ public interface ITaPersonService extends IService<TaPerson> {
 
 
     List<TaPersonBuilding> getPersonBuildings(String personId);
+
+    /**
+     * 渠道管理下的经纪人
+     * @param name
+     * @param phone
+     * @return
+     */
+    ResponseBean channelBrokerList(String name, String phone,Integer pageNum,Integer pageSize);
 }

src/main/java/com/huiju/estateagents/service/TaChannelPersonService.java

@@ -0,0 +1,15 @@
+package com.huiju.estateagents.service;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaChannelPerson;
+
+/**
+ * <p>
+ *   服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-17
+ */
+public interface TaChannelPersonService extends IService<TaChannelPerson> {
+
+}

src/main/java/com/huiju/estateagents/service/TaChannelService.java

@@ -0,0 +1,15 @@
+package com.huiju.estateagents.service;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaChannel;
+
+/**
+ * <p>
+ *   服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-17
+ */
+public interface TaChannelService extends IService<TaChannel> {
+
+}

src/main/java/com/huiju/estateagents/service/impl/TaChannelPersonServiceImpl.java

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaChannelPerson;
+import com.huiju.estateagents.mapper.TaChannelPersonMapper;
+import com.huiju.estateagents.service.TaChannelPersonService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *   服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-17
+ */
+@Service
+public class TaChannelPersonServiceImpl extends ServiceImpl<TaChannelPersonMapper, TaChannelPerson> implements TaChannelPersonService {
+
+}

src/main/java/com/huiju/estateagents/service/impl/TaChannelServiceImpl.java

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaChannel;
+import com.huiju.estateagents.mapper.TaChannelMapper;
+import com.huiju.estateagents.service.TaChannelService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *   服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-17
+ */
+@Service
+public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel> implements TaChannelService {
+
+}

src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java

@@ -609,6 +609,15 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         return taPersonBuildingMapper.selectList(queryWrapper);
     }
 
+    @Override
+    public ResponseBean channelBrokerList(String name, String phone,Integer pageNum,Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean<>();
+        IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
+        IPage<TaPerson> IPage = taPersonMapper.channelBrokerList(pg,name,phone);
+        responseBean.addSuccess(IPage);
+        return responseBean;
+    }
+
     @Override
     public IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building){
         QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();

src/main/resources/mapper/TaChannelMapper.xml

@@ -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.huiju.estateagents.mapper.TaChannelMapper">
+
+</mapper>

src/main/resources/mapper/TaChannelPersonMapper.xml

@@ -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.huiju.estateagents.mapper.TaChannelPersonMapper">
+
+</mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -489,4 +489,17 @@ FROM
 	GROUP BY a.person_id
     </select>
 
+    <select id="channelBrokerList" resultType="com.huiju.estateagents.entity.TaPerson">
+        select * from ta_person
+        <where>
+        <if test="name !=null and name !=''">
+            and name = #{name}
+        </if>
+        <if test="phone !=null and phone !=''">
+            and tel = #{phone}
+        </if>
+        and person_type = 'estate agent'
+        </where>
+    </select>
+
 </mapper>