add ant image upload

pom.xml

@@ -150,6 +150,12 @@
 				<profiles.active>nj</profiles.active>
 			</properties>
 		</profile>
+		<profile>
+			<id>gzysd</id>
+			<properties>
+				<profiles.active>gzysd</profiles.active>
+			</properties>
+		</profile>
 	</profiles>
 	<build>
 		<plugins>

src/main/java/com/huiju/estateagents/base/UserControl.java

@@ -0,0 +1,38 @@
+package com.huiju.estateagents.base;
+
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.exception.EstaException;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * 用户控制
+ */
+public class UserControl {
+
+    /**
+     * 获取用户信息
+     * @return
+     */
+    public static TaUser getUser() {
+        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
+        HttpSession session = servletRequestAttributes.getRequest().getSession();
+        TaUser taUser = (TaUser) session.getAttribute("miniapp_user");
+        if (null == taUser) {
+            throw new EstaException("用户信息不存在, 请登录!");
+        }
+        return taUser;
+    }
+
+    /**
+     * 获取公司 org_id
+     * @return
+     */
+    public static Integer getOrgId() {
+        TaUser user = getUser();
+        return user.getOrgId();
+    }
+
+}

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -1,18 +1,28 @@
 package com.huiju.estateagents.center.taUser.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.center.sysUser.entity.SysToken;
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.common.MD5Utils;
+import com.huiju.estateagents.entity.TaPerson;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -31,6 +41,9 @@ public class TaUserController extends BaseController {
 
     @Autowired
     public ITaUserService iTaUserService;
+    
+    @Autowired
+    private ISysTokenService sysTokenService;
 
 
     /**
@@ -116,8 +129,7 @@ public class TaUserController extends BaseController {
         return responseBean;
     }
     /**
-     * 根据id查询对象
-     * @param id  实体ID
+     * 获取用户信息
      */
     @RequestMapping(value="/center/taUser/{id}",method= RequestMethod.GET)
     public ResponseBean taUserGet(@PathVariable Integer id){
@@ -129,6 +141,79 @@ public class TaUserController extends BaseController {
             logger.error("taUserDelete -=- {}",e.toString());
             responseBean.addError(e.getMessage());
         }
+
+        return responseBean;
+    }
+
+    /**
+     * 获取当前用户信息
+     * @param request
+     * @return
+     */
+    @RequestMapping(value="/admin/taUser/current",method= RequestMethod.GET)
+    public ResponseBean taUserGetCurrent(HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        try {
+            TaUser taUser = iTaUserService.getById(map.get("userId").toString());
+            taUser.setLoginPassword("");
+            responseBean.addSuccess(taUser);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
         return responseBean;
     }
+    
+    /**
+     * 用户手机号登录
+     * @param paramStr
+     * @return
+     */
+    @PostMapping("/admin/taUser/signin")
+    public ResponseBean signin(@RequestBody String paramStr) {
+        JSONObject params = JSONObject.parseObject(paramStr);
+        if (params == null) {
+            return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+    
+        String userName = params.getString("loginName");
+        String userPassword = params.getString("loginPassword");
+    
+        //验证用户名密码是否正确
+        QueryWrapper<TaUser> sysUserQueryWrapper = new QueryWrapper<>();
+        sysUserQueryWrapper.eq("login_name",userName);
+        sysUserQueryWrapper.eq("login_password", MD5Utils.md5(userPassword));
+        TaUser taUser = iTaUserService.getOne(sysUserQueryWrapper);
+        if (taUser == null) {
+            return ResponseBean.error("用户名或密码错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+    
+        if (taUser.getStatus() != CommConstant.STATUS_NORMAL) {
+            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        taUser.setLoginPassword("");
+        Map map = new HashMap();
+        map.put("userId",taUser.getUserId().toString());
+        map.put("orgId",taUser.getOrgId().toString());
+        String token = JWTUtils.newTokenByMap(map);
+    
+        //保存token
+        saveToken(token);
+    
+        Map<String, Object> result = new HashMap<>();
+        result.put("token", token);
+        result.put("user", taUser);
+    
+        return ResponseBean.success(result);
+    }
+    
+    
+    private void saveToken(String token) {
+        SysToken sysToken = new SysToken();
+        sysToken.setToken(token);
+        sysToken.setExpDate(LocalDateTime.now());
+        sysTokenService.save(sysToken);
+    }
 }

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -18,6 +18,21 @@ public class CommConstant {
      */
     public final static String PERSON_ESTATE_AGENT = "estate agent";
 
+    /**
+     * 人员类型: 客户
+     */
+    public final static String PERSON_ESTATE_CUSTOMER = "customer";
+
+    /**
+     * 人员类型: 客户
+     */
+    public final static String PERSON_ESTATE_CHANNEL = "channel agent";
+
+    /**
+     * 人员类型: 游客
+     */
+    public final static String PERSON_ESTATE_DRIFT = "drift";
+
     /**
      * 状态: 正常
      */

src/main/java/com/huiju/estateagents/common/JWTUtils.java

@@ -39,6 +39,27 @@ public class JWTUtils {
         return null;
     }
     
+    /**
+     * getSubject 获取 jwt subject
+     * @param request
+     * @return
+     */
+    public static Map getUserIdAndOrgId(HttpServletRequest request) {
+        String jwtHeader = request.getHeader("authorization");
+        if (null == jwtHeader || "".equals(jwtHeader.trim())) return null;
+        
+        String[] jwtAuths = jwtHeader.split("Bearer ");
+        if (null == jwtAuths || jwtAuths.length < 2) return null;
+        
+        try {
+            return Jwts.parser().setSigningKey(key).parseClaimsJws(jwtAuths[1]).getBody();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        
+        return null;
+    }
+    
     /**
      * getSubject 获取 jwt subject
      * @param request

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

@@ -12,11 +12,8 @@ import com.huiju.estateagents.common.WxUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.mapper.TaShareMapper;
-import com.huiju.estateagents.service.IMiniAppService;
-import com.huiju.estateagents.service.ITaCustomerPersonService;
-import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.*;
 import com.huiju.estateagents.common.JWTUtils;
-import com.huiju.estateagents.service.ITaRecommendCustomerService;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
@@ -54,6 +51,9 @@ public class MiniAppController {
     @Autowired
     private TaShareMapper taShareMapper;
 
+    @Autowired
+    private ITaOrgService taOrgService;
+
 
 
     /**
@@ -114,7 +114,12 @@ public class MiniAppController {
 
             // 获取其余信息
             Map<String, Object> extraInfo = taPersonService.getExtraInfo(taPerson.getPersonId());
-
+            if (CommConstant.PERSON_REALTY_CONSULTANT.equals(taPerson.getPersonType())){
+                QueryWrapper<TaOrg>orgQueryWrapper = new QueryWrapper<>();
+                orgQueryWrapper.eq("org_id",taPerson.getOrgId());
+                TaOrg org = taOrgService.getOne(orgQueryWrapper);
+                taPerson.setOrg(org);
+            }
             Map<String, Object> result = new HashMap<>();
             result.put("miniApp", miniResp);
             result.put("person", taPerson);
@@ -222,7 +227,7 @@ public class MiniAppController {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
-        person.setPersonType(CommConstant.PERSON_ESTATE_AGENT);
+        person.setPersonType(CommConstant.PERSON_ESTATE_CUSTOMER);
         taPersonService.updateById(person);
         QueryWrapper<TaRecommendCustomer> cus= new QueryWrapper<>();
         cus.eq("phone",phoneNoInfo.getPhoneNumber());

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

@@ -23,6 +23,7 @@ import javax.servlet.http.HttpSession;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -57,7 +58,7 @@ public class TaBuildingController extends BaseController {
     }
 
     /**
-     * 楼盘列表
+     * 楼盘列表 查询所有有效的
      * @param pageNum
      * @param pageSize
      * @param name
@@ -69,12 +70,13 @@ public class TaBuildingController extends BaseController {
                                      @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
                                      @RequestParam(value = "name", required = false)String name,
                                      @RequestParam(value = "code", required = false)String code,
-                                     @RequestParam(value = "startDate",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)LocalDateTime startDate,
+                                     @RequestParam(value = "startDate",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startDate,
                                      @RequestParam(value = "buildingStatus",required = false)String buildingStatus,
                                      @RequestParam(value = "marketStatus",required = false)String marketStatus,
                                      @RequestParam(value = "cityId",required = false)Integer cityId,
-                                     @RequestParam(value = "isMain",required = false)Integer isMain){
-        return taBuildingService.buildingList(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain);
+                                     @RequestParam(value = "isMain",required = false)Integer isMain,
+                                     @RequestParam(value = "orgId",required = false)Integer orgId){
+        return taBuildingService.buildingList(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain, orgId);
     }
 
     /**
@@ -94,8 +96,9 @@ public class TaBuildingController extends BaseController {
                                      @RequestParam(value = "buildingStatus",required = false)String buildingStatus,
                                      @RequestParam(value = "marketStatus",required = false)String marketStatus,
                                      @RequestParam(value = "cityId",required = false)Integer cityId,
-                                     @RequestParam(value = "isMain",required = false)Integer isMain){
-        return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain);
+                                     @RequestParam(value = "isMain",required = false)Integer isMain,HttpServletRequest request){
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain,Integer.valueOf(map.get("orgId").toString()));
     }
 
     /**

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

@@ -74,9 +74,10 @@ public class TaBuildingDynamicController extends BaseController {
                                              @RequestParam(required = false)String name,
                                              @RequestParam(required = false)Integer cityId,
                                              @RequestParam(required = false)String buildingId,
+                                             @RequestParam(required = false)String title,
                                              @RequestParam(required = false)String isEnlist,
                                              @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime time){
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time);
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title);
         return responseBean;
     }
 

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

@@ -0,0 +1,192 @@
+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.common.JWTUtils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaChannel;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.mapper.TaChannelMapper;
+import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.TaChannelService;
+import org.apache.http.HttpRequest;
+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;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+
+
+/**
+ * <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;
+
+    @Autowired
+    public TaChannelMapper taChannelMapper;
+
+
+    /**
+     * 分页查询列表
+     * @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,
+                                    @RequestParam(value ="channelId",required = false) Integer channelId,
+                                    HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        String orgid = JWTUtils.getSubject(request);
+        try {
+            //使用分页插件
+		    IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaChannel> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq(null != channelId, "channel_id", channelId);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaChannel> result = taChannelService.page(pg, queryWrapper);
+          HashMap hashMap  = new HashMap<>();
+            hashMap.put("result",result);
+            // 下拉列表的数据 all
+            List<TaChannel> taChannelList = taChannelMapper.selectChannelList();
+            hashMap.put("channelNmae",taChannelList);
+            responseBean.addSuccess(hashMap);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param channel 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/channel",method= RequestMethod.POST)
+    public ResponseBean channelAdd(@RequestBody TaChannel channel){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            // 生成6位数的渠道码
+            int channelCode= taChannelMapper.channelCode();
+            channel.setChannelCode(String.valueOf(channelCode));
+            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="/admin/channel/broker",method= RequestMethod.GET)
+    public  ResponseBean channelBrokerList(@RequestParam(value="name",required = false) String name,
+                                           @RequestParam(value="phone",required = false) String phone,
+                                           @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean taPerson =  taPersonService.channelBrokerList(name,phone,pageNum,pageSize);
+        return taPerson;
+    }
+}

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

@@ -0,0 +1,150 @@
+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.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/TaPersonController.java

@@ -2,20 +2,27 @@ 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.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
-import com.huiju.estateagents.entity.TaBuildingDynamic;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.TaChannelPersonService;
+import com.huiju.estateagents.service.TaChannelService;
+import org.checkerframework.checker.units.qual.A;
+import org.checkerframework.checker.units.qual.C;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import com.huiju.estateagents.base.BaseController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -34,6 +41,12 @@ import java.util.Map;
 public class TaPersonController extends BaseController {
     @Autowired
     ITaPersonService taPersonService;
+    @Autowired
+    TaChannelService taChannelService;
+    @Autowired
+    TaChannelPersonService taChannelPersonService;
+    @Autowired
+    ITaUserService taUserService;
 
     /**
      *
@@ -74,6 +87,70 @@ public class TaPersonController extends BaseController {
 
     }
 
+    @PutMapping("/wx/registerConsultant")
+    public ResponseBean registerConsultant(@RequestParam Integer orgId,HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        String openid = JWTUtils.getSubject(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("phone",person.getPhone());
+        queryWrapper.eq("org_id",orgId);
+        List<TaUser> users = taUserService.list(queryWrapper);
+        if(users.size()>0){
+            TaUser user = users.get(0);
+            person.setPersonType(CommConstant.PERSON_REALTY_CONSULTANT);
+            person.setUserId(user.getUserId());
+            person.setAvatarurl(user.getAvatar());
+            taPersonService.updateById(person);
+            responseBean.addSuccess(person);
+        }else {
+            responseBean.addError("您不是置业顾问。");
+        }
+        return responseBean;
+    }
+
+    @PutMapping("/wx/registerAgent")
+    public ResponseBean registerAgent(@RequestParam String recommendAgentCode, @RequestParam String channelCode,@RequestParam Integer orgId,HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        String openid = JWTUtils.getSubject(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        person.setAgentCode(taPersonService.agentCodeGenerator());
+        if (!StringUtils.isEmpty(recommendAgentCode)){
+            QueryWrapper<TaPerson> agentWrapper = new QueryWrapper();
+            agentWrapper.eq("agent_code",recommendAgentCode);
+            agentWrapper.eq("org_id",orgId);
+            TaPerson agent = taPersonService.getOne(agentWrapper);
+            if (null != agent){
+                person.setRecommendAgent(agent.getPersonId());
+            }
+        }
+        if(StringUtils.isEmpty(channelCode)){
+            person.setPersonType(CommConstant.PERSON_ESTATE_AGENT);
+        }else {
+            person.setPersonType(CommConstant.PERSON_ESTATE_CHANNEL);
+            QueryWrapper<TaChannel> queryWrapper = new QueryWrapper();
+            queryWrapper.eq("channel_code",channelCode);
+            TaChannel channel = taChannelService.getOne(queryWrapper);
+            TaChannelPerson channelPerson = new TaChannelPerson();
+            channelPerson.setChannelId(channel.getChannelId());
+            channelPerson.setPersonId(person.getPersonId());
+            channelPerson.setCreateDate(LocalDateTime.now());
+            taChannelPersonService.save(channelPerson);
+        }
+        taPersonService.updateById(person);
+        responseBean.addSuccess(person);
+
+        return responseBean;
+    }
+
     /**
      * 绑定卡片
      * @param paramStr

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/TaBuilding.java

@@ -183,6 +183,12 @@ public class TaBuilding implements Serializable {
     private Integer saveNum;
     private Integer shareNum;
 
+    /**
+     * 公司Id
+     */
+    private Integer orgId;
+
+
 
     /**
      * 图片

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

@@ -176,4 +176,9 @@ public class TaBuildingDynamic implements Serializable {
     private Integer enlistNum;
 
     private Integer weight;
+
+    /**
+     * 公司Id
+     */
+    private Integer orgId;
 }

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/entity/TaChat.java

@@ -79,5 +79,10 @@ public class TaChat implements Serializable {
      */
     private String messageType;
 
+    /**
+     * 公司Id
+     */
+    private Integer orgId;
+
 
 }

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

@@ -64,4 +64,9 @@ public class TaCheckin implements Serializable {
      */
     private String activityName;
 
+    /**
+     * 公司Id
+     */
+    private Integer orgId;
+
 }

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

@@ -228,10 +228,22 @@ public class TaPerson implements Serializable {
 
     private String fromCode;
 
+    private String orgId;
+
     private Integer userId;
 
     private String userPort;
 
+    private String agentCode;
+
+    private String recommendAgent;
+
     @TableField(exist = false)
     private Integer isSave;
+
+    @TableField(exist = false)
+    private int recommendCount;
+
+    @TableField(exist = false)
+    private TaOrg org;
 }

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

@@ -54,5 +54,9 @@ public class TaPersonPoints implements Serializable {
      */
     private LocalDateTime createDate;
 
+    /**
+     * 公司Id
+     */
+    private Integer orgId;
 
 }

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -28,6 +28,7 @@ public class AccessInterceptor implements HandlerInterceptor {
             "/api/taCheckin/activity",
             "/api/wx/qrcode/scene",
 		    "/api/center/signin",
+		    "/api/admin/taUser/signin",
     };
 
     /*

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

@@ -27,7 +27,7 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
      * @param page
      * @return
      */
-    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId,@Param("cityId") Integer cityId,@Param("isEnlist") String isEnlist,@Param("time")LocalDateTime time);
+    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId,@Param("cityId") Integer cityId,@Param("isEnlist") String isEnlist,@Param("time")LocalDateTime time,@Param("title") String title);
 
     /**
      * 详情

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

@@ -28,14 +28,14 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
      * @param page
      * @return
      */
-    List<TaBuilding> buildingList(IPage<TaBuilding> page, @Param("Name") String name, @Param("Code")String code,@Param("startDate")LocalDateTime startDate, @Param("buildingStatus")String buildingStatus, @Param("marketStatus")String marketStatus, @Param("cityId")Integer cityId, @Param("isMain")Integer isMain);
+    List<TaBuilding> buildingList(IPage<TaBuilding> page, @Param("Name") String name, @Param("Code")String code,@Param("startDate")LocalDateTime startDate, @Param("buildingStatus")String buildingStatus, @Param("marketStatus")String marketStatus, @Param("cityId")Integer cityId, @Param("isMain")Integer isMain, @Param("orgId") Integer orgId);
 
     /**
      * 楼盘列表
      * @param page
      * @return
      */
-    List<TaBuilding> buildingListSelect(IPage<TaBuilding> page, @Param("Name") String name, @Param("Code")String code,@Param("startDate")LocalDateTime startDate, @Param("buildingStatus")String buildingStatus, @Param("marketStatus")String marketStatus, @Param("cityId")Integer cityId, @Param("isMain")Integer isMain);
+    List<TaBuilding> buildingListSelect(IPage<TaBuilding> page, @Param("Name") String name, @Param("Code")String code,@Param("startDate")LocalDateTime startDate, @Param("buildingStatus")String buildingStatus, @Param("marketStatus")String marketStatus, @Param("cityId")Integer cityId, @Param("isMain")Integer isMain,@Param("orgId") Integer orgId);
 
 
     @Update("UPDATE ta_building  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE building_id = #{buildingId}")

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

@@ -0,0 +1,31 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaChannel;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ *   Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-17
+ */
+@Mapper
+public interface TaChannelMapper extends BaseMapper<TaChannel> {
+
+    /**
+     * 渠道码
+     * @return
+     */
+    int channelCode();
+
+    /**
+     * 渠道页面下拉列表的所有数据
+     * @return
+     */
+    List<TaChannel> selectChannelList();
+}

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/ITaBuildingDynamicService.java

@@ -25,7 +25,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * 项目动态管理列表
      * @return
      */
-    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time);
+    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title);
 
     /**
      * 项目详情

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

@@ -24,7 +24,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param pageSize
      * @return
      */
-    ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain);
+    ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId);
 
     /**
      * 楼盘列表
@@ -32,7 +32,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param pageSize
      * @return
      */
-    ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain);
+    ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain,Integer orgId);
 
     /**
      * 楼盘详情

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

@@ -62,4 +62,16 @@ public interface ITaPersonService extends IService<TaPerson> {
 
 
     List<TaPersonBuilding> getPersonBuildings(String personId);
+
+    String agentCodeGenerator ();
+
+
+
+    /**
+     * 渠道管理下的经纪人
+     * @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/TaBuildingDynamicServiceImpl.java

@@ -64,12 +64,12 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         binder.registerCustomEditor(Date.class, editor);
     }
     @Override
-    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time) {
+    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title) {
         Page<TaBuildingDynamic> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
 
-        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time);
+        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time,title);
         List<TaBuildingDynamic> buildingDynamicList = buildingDynamic.getRecords();
         for (TaBuildingDynamic taBuildingDynamic:buildingDynamicList){
             QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist= new QueryWrapper<>();

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

@@ -70,21 +70,21 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
 
     @Override
-    public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain) {
+    public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId) {
         Page<TaBuilding> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
-        List<TaBuilding> building = taBuildingMapper.buildingList(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain);
+        List<TaBuilding> building = taBuildingMapper.buildingList(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain, orgId);
         page.setRecords(building);
 
         return ResponseBean.success(page);
     }
     @Override
-    public ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain) {
+    public ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain,Integer orgId) {
         Page<TaBuilding> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
-        List<TaBuilding> building = taBuildingMapper.buildingListSelect(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain);
+        List<TaBuilding> building = taBuildingMapper.buildingListSelect(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain,orgId);
         page.setRecords(building);
 
         return ResponseBean.success(page);

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<>();
@@ -644,5 +653,24 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
     }
 
+    public String codeGenerator (){
+        double r = Math.random();
+        int i = (int)(r*100000);
+        return String.valueOf(i);
+    }
+
+    @Override
+    public String agentCodeGenerator (){
+        QueryWrapper<TaPerson>queryWrapper = new QueryWrapper<>();
+        while (true){
+            String code = codeGenerator();
+            queryWrapper.eq("agent_code",code);
+            Integer count = taPersonMapper.selectCount(queryWrapper);
+            if (count<=0){
+                return code;
+            }
+        }
+    }
+
 
 }

src/main/resources/application-gzysd.yml

@@ -0,0 +1,51 @@
+server:
+  port: 8009
+spring:
+  application:
+    name: estateagents
+  datasource:
+    username: estateagents
+    password: DQ@0lW##kBb2+-jPZ
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_17?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    initial-size: 10 # 初始化连接数
+    max-active: 20 # 最大连接数
+    min-idle: 8 # 最小空闲数
+    max-idle: 8 # 最大空闲数
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: 50MB
+
+##mybatis-plus
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    call-setters-on-nulls: true
+  mapper-locations: classpath:mapper/*.xml
+wx:
+  miniapp:
+    appid: wxe3b1e683853800b5
+    secret: 207dd6d0f807b2dd0d41b57a8184365f
+    token:
+    aesKey:
+    msgDataFormat: JSON
+  tpls:
+    - name: notice
+      id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
+      keywords: 4
+    - name: newCustomer
+      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
+      keywords: 4
+    - name: mainbiz
+      id: IywdSfNPegeg5GB3Q-TVieSYD9DA0im8eI-hF_u0i-4
+      keywords: 6
+ali:
+  accessKeyId: LTAIkc75dpkJw8Lb
+  accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
+  oss:
+    endpoint: oss-cn-shanghai.aliyuncs.com
+    bucketName: estateagents
+    bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
+
+

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -30,6 +30,9 @@
         <if test="cityId != 0 and cityId != null">
             and city_id = #{cityId}
         </if>
+        <if test="title != null and title != ''">
+            and title = #{title}
+        </if>
         <if test="time != null">
             and TO_DAYS(create_date) = TO_DAYS(#{time})
         </if>

src/main/resources/mapper/TaBuildingMapper.xml

@@ -26,6 +26,9 @@
             <if test="isMain != null and isMain != ''">
                 and  ta_building.is_main = #{isMain}
             </if>
+            <if test="orgId != null">
+                and  ta_building.org_id = #{orgId}
+            </if>
         </where>
         ORDER BY create_date DESC
     </select>
@@ -52,6 +55,9 @@
             <if test="isMain != null and isMain != ''">
                 and  ta_building.is_main = #{isMain}
             </if>
+            <if test="orgId != null and orgId != ''">
+                and  ta_building.org_id = #{orgId}
+            </if>
         </where>
         ORDER BY create_date DESC
     </select>

src/main/resources/mapper/TaChannelMapper.xml

@@ -0,0 +1,29 @@
+<?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">
+
+    <select id="channelCode" resultType="int">
+        drop FUNCTION if exists roundNum;
+        create function roundNum() returns int
+        begin
+        declare x int default 1;
+        declare y int default 0;
+        declare a int default 20;
+        declare b int default 1;
+        while (b <![CDATA[ < a ]]> ) do
+        set x = (select (select FLOOR(100000 + RAND()*900000))  as num);
+        set y = (select count(1) from ta_channel where channel_code = x);
+        if y = 0
+        then return x;
+        END IF;
+        set b = b + 1;
+        end while;
+        return 0;
+        end;
+        select roundNum();
+    </select>
+    
+    <select id="selectChannelList" resultType="com.huiju.estateagents.entity.TaChannel">
+        select * from ta_channel ;
+    </select>
+</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,25 @@ FROM
 	GROUP BY a.person_id
     </select>
 
+    <select id="channelBrokerList" resultType="com.huiju.estateagents.entity.TaPerson">
+        select
+        p.avatarurl,
+        p.name,
+        p.tel,
+        p.sex,
+        COUNT(rc.person_id) as recommendCount
+        from ta_person p
+        LEFT JOIN ta_recommend_customer rc ON p.person_id = rc.person_id and rc.report_recommend_status = 1
+        <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>
+        GROUP BY p.person_id
+    </select>
+
 </mapper>