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

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

@@ -39,6 +39,26 @@ public class BaseController {
 		return null;
 	}
 
+	public Integer getChannelId(HttpServletRequest request){
+
+		Map map = JWTUtils.getUserIdAndOrgId(request);
+		if (null != map && null != map.get("channelId")){
+			return Integer.valueOf(map.get("channelId").toString());
+		}
+
+		return null;
+	}
+
+	public String getChannelUserName(HttpServletRequest request){
+
+		Map map = JWTUtils.getUserIdAndOrgId(request);
+		if (null != map && null != map.get("userName")){
+			return map.get("userName").toString();
+		}
+
+		return null;
+	}
+
 	public String getOpenId(HttpServletRequest request){
 
 		Map map = JWTUtils.getUserIdAndOrgId(request);

src/main/java/com/huiju/estateagents/center/sysUser/controller/SysUserController.java

@@ -10,6 +10,10 @@ 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.sysUser.service.ISysUserService;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
+import com.huiju.estateagents.channel.sysChannel.service.ITaChannelProxyService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.MD5Utils;
@@ -44,6 +48,12 @@ public class SysUserController extends BaseController {
     @Autowired
     private ISysTokenService sysTokenService;
 
+    @Autowired
+    private ITaUserService iTaUserService;
+
+    @Autowired
+    private ITaChannelProxyService iTaChannelProxyService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -162,13 +172,14 @@ public class SysUserController extends BaseController {
      */
     @RequestMapping(value="/center/current",method=RequestMethod.GET)
     public ResponseBean currentUser(HttpServletRequest request){
-        String userName = JWTUtils.getSubject(request);
-        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
-        sysUserQueryWrapper.eq("user_name",userName);
-        SysUser sysUser = iSysUserService.getOne(sysUserQueryWrapper);
-        sysUser.setPassword(null);
-
-        return ResponseBean.success(sysUser);
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
+        taChannelProxyQueryWrapper.eq("user_name", map.get("userName")).or().eq("channel_tel", map.get("userName"));
+        TaChannelProxy taChannelProxy = iTaChannelProxyService.getOne(taChannelProxyQueryWrapper);
+        if (StringUtils.isEmpty(taChannelProxy.getUserName())){
+            taChannelProxy.setUserName(map.get("userName").toString());
+        }
+        return ResponseBean.success(taChannelProxy);
     }
     
     @PostMapping("/center/signin")
@@ -177,34 +188,75 @@ public class SysUserController extends BaseController {
         if (params == null) {
             return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
         }
-        
+
+        QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
         String userName = params.getString("userName");
-        String userPassword = params.getString("password");
-        
+
+        taChannelProxyQueryWrapper.eq("user_name", userName).or().eq("channel_tel", userName);
+
         //验证用户名密码是否正确
-        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
-        sysUserQueryWrapper.eq("user_name",userName);
-        sysUserQueryWrapper.eq("password", MD5Utils.md5(userPassword));
-        SysUser sysUser = iSysUserService.getOne(sysUserQueryWrapper);
-        if (sysUser == null) {
+        TaChannelProxy taChannelProxy = iTaChannelProxyService.getOne(taChannelProxyQueryWrapper);
+        String defaultPsw = MD5Utils.md5("abc@123");
+        if (taChannelProxy == null || !defaultPsw.equals(params.getString("password"))) {
             return ResponseBean.error("用户名或密码错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
-        
-        if (sysUser.getStatus() != CommConstant.STATUS_NORMAL) {
-            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
+
+        //校验是否过期且是否停用
+        if (LocalDateTime.now().isAfter(taChannelProxy.getExpireDate()) || taChannelProxy.getStatus() == 0){
+            return ResponseBean.error("当前后台服务已到期，请联系管理员", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
-        
-        String token = JWTUtils.newToken(sysUser.getUserName());
-    
+
+        Map map = new HashMap();
+        map.put("userName", StringUtils.isEmpty(taChannelProxy.getUserName()) ? taChannelProxy.getChannelTel() : taChannelProxy.getUserName());
+        map.put("channelId",taChannelProxy.getChannelId().toString());
+        String token = JWTUtils.newTokenByMap(map);
+
         //保存token
         sysTokenService.saveToken(token);
         
         Map<String, Object> result = new HashMap<>();
         result.put("token", token);
-        result.put("user", sysUser);
+        result.put("user", taChannelProxy);
         
         return ResponseBean.success(result);
     }
+
+    @PostMapping("/center/changePassword")
+    public ResponseBean changePassword(@RequestBody String paramStr) {
+        JSONObject params = JSONObject.parseObject(paramStr);
+        if (params == null) {
+            return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+        String loginPassword = params.get("loginPassword").toString();
+        String newPassword = params.get("newPassword").toString();
+        String confirmPassword = params.get("confirmPassword").toString();
+
+        //校验密码
+        QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
+        taUserQueryWrapper.eq("user_id", params.get("userId"));
+        TaUser taUser = iTaUserService.getOne(taUserQueryWrapper);
+
+        if (!taUser.getLoginPassword().equals(MD5Utils.md5(MD5Utils.md5(loginPassword)))){
+            return ResponseBean.error("旧密码错误，请重新输入", ResponseBean.ERROR_UNAVAILABLE);
+        };
+
+        if (StringUtils.isEmpty(newPassword) || StringUtils.isEmpty(confirmPassword)){
+            return ResponseBean.error("请输入新密码", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        if (!newPassword.equals(confirmPassword)){
+            return ResponseBean.error("两次密码不一致，请确认重新输入", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        //重置密码
+        QueryWrapper<TaUser> updateWrapper = new QueryWrapper<>();
+        TaUser user = new TaUser();
+        user.setLoginPassword(MD5Utils.md5(MD5Utils.md5(newPassword)));
+        updateWrapper.eq("user_id", params.get("userId"));
+        iTaUserService.update(user, updateWrapper);
+
+        return ResponseBean.success("设置成功");
+    }
     
     @PostMapping("/center/signout")
     public ResponseBean signout(HttpServletRequest request) {

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

@@ -96,12 +96,41 @@ public class TaUserController extends BaseController {
      */
     @RequestMapping(value="/center/taUser",method= RequestMethod.GET)
     public ResponseBean taUserList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        String userName = getChannelUserName(request);
+        Integer channelId = null;
+        if (!"admin".equals(userName)){
+            channelId = getChannelId(request);
+        }
+
         try {
             //使用分页插件
 		    IPage pg = new Page<>(pageNum, pageSize);
-            IPage<Map<String,Object>> result = iTaUserService.getPageList(pg);
+            IPage<Map<String,Object>> result = iTaUserService.getPageList(pg, channelId);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/channel/taUser",method= RequestMethod.GET)
+    public ResponseBean taUserChannelList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage pg = new Page<>(pageNum, pageSize);
+            IPage<Map<String,Object>> result = iTaUserService.getPageList(pg, null);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -117,10 +146,11 @@ public class TaUserController extends BaseController {
      * @return
      */
     @RequestMapping(value="/center/taUser",method= RequestMethod.POST)
-    public ResponseBean taUserAdd(@RequestBody TaUser taUser){
+    public ResponseBean taUserAdd(@RequestBody TaUser taUser, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        Integer channelId = getChannelId(request);
         try {
-            responseBean.addSuccess(iTaUserService.newUserAndOrg(taUser));
+            responseBean.addSuccess(iTaUserService.newUserAndOrg(taUser, channelId));
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taUserAdd -=- {}",e.toString());

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -201,4 +201,16 @@ public class TaUser implements Serializable {
 
     @TableField(exist = false)
     private List<String> buildingIds = new ArrayList<String>();
+
+    /**
+     * 新密码
+     */
+    @TableField(exist = false)
+    private String newPassword;
+
+    /**
+     * 确认新密码
+     */
+    @TableField(exist = false)
+    private String confirmPassword;
 }

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserMapper.java

@@ -22,7 +22,7 @@ import java.util.Map;
 @Mapper
 public interface TaUserMapper extends BaseMapper<TaUser> {
 	
-	List<Map<String,Object>> getPageList(IPage<TaUser> pg);
+	List<Map<String,Object>> getPageList(IPage<TaUser> pg, @Param("channelId") Integer channelId);
 	
 	List<TaTags> getTagsList(@Param("userId") Integer userId,@Param("orgId") Integer orgId);
 	

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserService.java

@@ -20,9 +20,9 @@ import java.util.Map;
  */
 public interface ITaUserService extends IService<TaUser> {
 	
-	IPage<Map<String,Object>> getPageList(IPage<TaUser> pg);
+	IPage<Map<String,Object>> getPageList(IPage<TaUser> pg, Integer channelId);
 
-    TaUser newUserAndOrg(TaUser taUser) throws Exception;
+    TaUser newUserAndOrg(TaUser taUser, Integer channelId) throws Exception;
 
     TaUser getInfoWithOrg(Integer id);
 

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -14,6 +14,8 @@ import com.huiju.estateagents.center.taUser.mapper.TaTagUserMapper;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.center.taUser.mapper.TaUserRoleMapper;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
+import com.huiju.estateagents.channel.sysChannel.mapper.TaChannelProxyMapper;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.common.StringUtils;
@@ -21,11 +23,13 @@ import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.*;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -88,16 +92,28 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 
 	@Autowired
 	private ISysOrgParamsService iSysOrgParamsService;
-	
+
 	@Override
-	public IPage<Map<String,Object>> getPageList(IPage pg) {
-		List<Map<String,Object>> taUserList = taUserMapper.getPageList(pg);
+	public IPage<Map<String,Object>> getPageList(IPage pg, Integer channelId) {
+		List<Map<String,Object>> taUserList = taUserMapper.getPageList(pg, channelId);
+
+		for (Map map : taUserList){
+			if (map.get("orgId") == null){
+				map.put("userCount", 0);
+				map.put("registeredCount", 0);
+				continue;
+			}
+			Integer userCount = taPersonMapper.selectChannelUserCount(map.get("orgId").toString());
+			Integer registeredCount = taPersonMapper.selectChannelRegisteredCount(map.get("orgId").toString());
+			map.put("userCount", userCount);
+			map.put("registeredCount", registeredCount);
+		}
 		pg.setRecords(taUserList);
 		return pg;
 	}
 
 	@Override
-	public TaUser newUserAndOrg(TaUser taUser) throws Exception {
+	public TaUser newUserAndOrg(TaUser taUser, Integer channelId) throws Exception {
 		if (StringUtils.isEmpty(taUser.getPhone())) {
 			throw new Exception("电话号码不能为空");
 		}

src/main/java/com/huiju/estateagents/channel/sysChannel/controller/SysUserChannelController.java

@@ -0,0 +1,239 @@
+package com.huiju.estateagents.channel.sysUser.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.sysUser.service.ISysUserService;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
+import com.huiju.estateagents.channel.sysChannel.service.ITaChannelProxyService;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.common.MD5Utils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaNewsType;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+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.time.LocalTime;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+    * 系统用户 系统中心账户 前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@RestController
+@RequestMapping("/api")
+public class SysUserChannelController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysUserChannelController.class);
+
+    @Autowired
+    public ISysUserService iSysUserService;
+    
+    @Autowired
+    private ISysTokenService sysTokenService;
+
+    @Autowired
+    private ITaChannelProxyService iTaChannelProxyService;
+
+    /**
+     * 修改对象
+     * @param sysUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/channel/sysUser",method= RequestMethod.PUT)
+    public ResponseBean sysUserUpdate(@RequestBody SysUser sysUser, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            String userName = JWTUtils.getSubject(request);
+            sysUser.setPassword(MD5Utils.md5(sysUser.getPassword()));
+            sysUser.setUserName(userName);
+            if (iSysUserService.updateById(sysUser)){
+                responseBean.addSuccess(sysUser);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysUserUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    @PostMapping("/channel/signin")
+    public ResponseBean signinChannel(@RequestBody String paramStr) {
+        JSONObject params = JSONObject.parseObject(paramStr);
+        if (params == null) {
+            return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        String userName = params.getString("userName");
+        String userPassword = params.getString("password");
+
+        //验证用户名密码是否正确
+        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
+        sysUserQueryWrapper.eq("user_name",userName);
+        sysUserQueryWrapper.eq("password", MD5Utils.md5(userPassword));
+        sysUserQueryWrapper.eq("type", CommConstant.LOGIN_TYPE_CHANNEL);
+        SysUser sysUser = iSysUserService.getOne(sysUserQueryWrapper);
+        if (sysUser == null) {
+            return ResponseBean.error("用户名或密码错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (sysUser.getStatus() != CommConstant.STATUS_NORMAL) {
+            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        String token = JWTUtils.newToken(sysUser.getUserName());
+
+        //保存token
+        sysTokenService.saveToken(token);
+
+        Map<String, Object> result = new HashMap<>();
+        result.put("token", token);
+        result.put("user", sysUser);
+
+        return ResponseBean.success(result);
+    }
+
+    @PostMapping("/channel/signout")
+    public ResponseBean signoutChannel(HttpServletRequest request) {
+        String token = JWTUtils.getToken(request);
+        QueryWrapper<SysToken> sysTokenQueryWrapper = new QueryWrapper<>();
+        sysTokenQueryWrapper.eq("token",token);
+        sysTokenService.remove(sysTokenQueryWrapper);
+        return ResponseBean.success("成功退出");
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/channel/current",method=RequestMethod.GET)
+    public ResponseBean currentChannelUser(HttpServletRequest request){
+        String userName = JWTUtils.getSubject(request);
+        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
+        sysUserQueryWrapper.eq("user_name",userName);
+        sysUserQueryWrapper.eq("type",CommConstant.LOGIN_TYPE_CHANNEL);
+        SysUser sysUser = iSysUserService.getOne(sysUserQueryWrapper);
+        sysUser.setPassword(null);
+
+        return ResponseBean.success(sysUser);
+    }
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/channel/taChannel",method= RequestMethod.GET)
+    public ResponseBean taUserList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage pg = new Page<>(pageNum, pageSize);
+            IPage<TaChannelProxy> result = iTaChannelProxyService.getChannelList(pg);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 新增代理商
+     * @param taChannelProxy
+     * @param request
+     * @return
+     */
+    @RequestMapping(value="/channel/taChannel",method= RequestMethod.POST)
+    public ResponseBean taUserList(@RequestBody TaChannelProxy taChannelProxy, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (taChannelProxy.getAppMaxNum() != null && taChannelProxy.getAppMaxNum() < 0){
+                responseBean.addError("维护小程序数量不得小于0");
+                return responseBean;
+            }
+
+            QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
+            taChannelProxyQueryWrapper.eq("channel_tel", taChannelProxy.getChannelTel());
+            Integer countChannel = iTaChannelProxyService.count(taChannelProxyQueryWrapper);
+            if (countChannel > 0){
+                responseBean.addError("手机号已存在");
+                return responseBean;
+            }
+
+            taChannelProxy.setStatus(1);
+            taChannelProxy.setCreateTime(LocalDateTime.now());
+            iTaChannelProxyService.save(taChannelProxy);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/channel/taChannel/{id}",method= RequestMethod.GET)
+    public ResponseBean getChannelProxyById(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<TaChannelProxy> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("channel_id", id);
+        TaChannelProxy taChannelProxy = iTaChannelProxyService.getOne(queryWrapper);
+        responseBean.addSuccess(taChannelProxy);
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id
+     * @param taChannelProxy
+     * @param request
+     * @return
+     */
+    @RequestMapping(value="/channel/taChannel/{id}",method= RequestMethod.PUT)
+    public ResponseBean taNewsTypeUpdate(@PathVariable Integer id,
+                                         @RequestBody TaChannelProxy taChannelProxy, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        if (taChannelProxy.getAppMaxNum() != null && taChannelProxy.getAppMaxNum() < 0){
+            responseBean.addError("维护小程序数量不得小于0");
+            return responseBean;
+        }
+
+        QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
+        taChannelProxyQueryWrapper.eq("channel_id", id);
+        iTaChannelProxyService.update(taChannelProxy, taChannelProxyQueryWrapper);
+        return ResponseBean.success("更新成功");
+    }
+
+}

src/main/java/com/huiju/estateagents/channel/sysChannel/entity/TaChannelProxy.java

@@ -0,0 +1,36 @@
+package com.huiju.estateagents.channel.sysChannel.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaChannelProxy {
+    private Integer channelId;
+
+    private String channelProxyName;
+
+    private String channelImg;
+
+    private String channelContactName;
+
+    private String channelTel;
+
+    private String userName;
+
+    private LocalDateTime expireDate;
+
+    private Integer status;
+
+    private Integer appMaxNum;
+
+    private LocalDateTime createTime;
+
+    @TableField(exist = false)
+    private Integer appCurrentNum;
+}

src/main/java/com/huiju/estateagents/channel/sysChannel/mapper/TaChannelProxyMapper.java

@@ -0,0 +1,12 @@
+package com.huiju.estateagents.channel.sysChannel.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TaChannelProxyMapper extends BaseMapper<TaChannelProxy> {
+    IPage<TaChannelProxy> getChannelList(IPage page);
+}

src/main/java/com/huiju/estateagents/channel/sysChannel/service/ITaChannelProxyService.java

@@ -0,0 +1,10 @@
+package com.huiju.estateagents.channel.sysChannel.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
+
+
+public interface ITaChannelProxyService extends IService<TaChannelProxy> {
+    IPage<TaChannelProxy> getChannelList(IPage page);
+}

src/main/java/com/huiju/estateagents/channel/sysChannel/service/impl/TaChannelProxyServiceImpl.java

@@ -0,0 +1,38 @@
+package com.huiju.estateagents.channel.sysChannel.service.impl;
+
+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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
+import com.huiju.estateagents.channel.sysChannel.mapper.TaChannelProxyMapper;
+import com.huiju.estateagents.channel.sysChannel.service.ITaChannelProxyService;
+import com.huiju.estateagents.entity.TaChannelAppRelation;
+import com.huiju.estateagents.mapper.TaChannelAppRelationMapper;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TaChannelProxyServiceImpl extends ServiceImpl<TaChannelProxyMapper, TaChannelProxy>  implements ITaChannelProxyService {
+    @Autowired
+    private TaChannelProxyMapper taChannelProxyMapper;
+
+    @Autowired
+    private TaChannelAppRelationMapper taChannelAppRelationMapper;
+
+    @Override
+    public IPage<TaChannelProxy> getChannelList(IPage page) {
+        IPage<TaChannelProxy> taChannelProxyIPage = taChannelProxyMapper.getChannelList(page);
+        if (CollectionUtils.isNotEmpty(taChannelProxyIPage.getRecords())){
+            taChannelProxyIPage.getRecords().forEach(e->{
+                QueryWrapper<TaChannelAppRelation> taChannelAppRelationQueryWrapper = new QueryWrapper<>();
+                taChannelAppRelationQueryWrapper.eq("channel_id", e.getChannelId());
+                taChannelAppRelationQueryWrapper.groupBy("channel_id");
+                e.setAppCurrentNum(taChannelAppRelationMapper.selectCount(taChannelAppRelationQueryWrapper));
+            });
+            taChannelProxyIPage.setRecords(taChannelProxyIPage.getRecords());
+        }
+        return taChannelProxyIPage;
+    }
+}

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

@@ -541,4 +541,18 @@ public class CommConstant {
      */
     public static final String MESSAGE_TYPE_OF_MINIAPP_TEMPLATE = "miniapp_template";
 
+    /**
+     * 进入小程序
+     */
+    public static final String BIZ_EVENT_START = "start";
+
+    /**
+     * 登录渠道端系统类型
+     */
+    public static final String LOGIN_TYPE_CHANNEL = "channel";
+
+    /**
+     * 登录中心端系统类型
+     */
+    public static final String LOGIN_TYPE_CENTER = "center";
 }

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

@@ -163,4 +163,14 @@ public class StatisticalController extends BaseController {
         return iStatisticalService.selectIntentionUser(pageNum, pageSize, getOrgId(request), buildingId);
     }
 
+    /**
+     * 用户来源  首页
+     * @return
+     */
+    @GetMapping(value = "/admin/selectPersonFrom")
+    public ResponseBean selectPersonFrom(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                         @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                            HttpServletRequest request) {
+        return iStatisticalService.selectPersonFrom(getOrgId(request), startDate,endDate);
+    }
 }

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

@@ -79,9 +79,9 @@ public class TaMiniappController extends BaseController {
     @RequestMapping(value="/center/taMiniapp",method= RequestMethod.POST)
     public ResponseBean taMiniappAdd(@RequestBody TaMiniapp taMiniapp, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
-
+        Integer channelId = getChannelId(request);
         try {
-            iTaMiniappService.saveInfoWithTpls(taMiniapp);
+            iTaMiniappService.saveInfoWithTpls(taMiniapp, channelId);
             responseBean.addSuccess(taMiniapp);
         }catch (Exception e){
             e.printStackTrace();

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

@@ -142,8 +142,11 @@ public class TaPersonVisitRecordController extends BaseController {
         }
         try {
             if (iTaPersonVisitRecordService.save(taPersonVisitRecord)){
-                //清洗埋點數據到新增用戶表
-                iTaPersonFromRecordService.addNewPersonRecordRecord(taPersonVisitRecord);
+                //清洗埋點數據到新增用戶表--只有进入小程序的时候 start才记录
+                if(taPersonVisitRecord.getEvent().equals(CommConstant.BIZ_EVENT_START)){
+                    iTaPersonFromRecordService.addNewPersonRecordRecord(taPersonVisitRecord);
+                }
+
                 return ResponseBean.success(taPersonVisitRecord);
             }else {
                 return ResponseBean.error("保存失败",ResponseBean.ERROR_UNAVAILABLE);

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

@@ -306,7 +306,8 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
                                          @RequestParam(value = "sex",required = false)Integer sex,
                                          @RequestParam(value = "customerType") String customerType,// public 公  private 私
-                                         @RequestParam(value = "status",required = false) Integer status){
+                                         @RequestParam(value = "status",required = false) Integer status,
+                                         @RequestParam(value = "sceneType",required = false) String sceneType){
         try{
 
             // TODO 目前如果是公客，就取当前操作人员的 buildingId
@@ -320,7 +321,7 @@ public class TaRecommendCustomerController extends BaseController {
 //                TaPersonBuilding personBuilding = taPersonBuildingMapper.selectOne(queryWrapper);
 //                buildingId = personBuilding.getBuildingId();
 //            }
-            return ResponseBean.success(taRecommendCustomerService.getCustomerList(status,pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, getOrgId(request),getTaPersonBuildingListByUserId(request)));
+            return ResponseBean.success(taRecommendCustomerService.getCustomerList(status,pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, getOrgId(request),getTaPersonBuildingListByUserId(request),sceneType));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -521,10 +522,12 @@ public class TaRecommendCustomerController extends BaseController {
     @GetMapping(value = "/admin/customer/recommend/get/{id}")
     public ResponseBean getCustomerDetail(@PathVariable String id,
                                           @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,HttpServletRequest request) {
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          @RequestParam(value ="buildingId",required = false) String buildingId,
+                                          HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id,pageNumber,pageSize,getTaPersonBuildingListByUserId(request)));
+            responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id,pageNumber,pageSize,getTaPersonBuildingListByUserId(request),buildingId));
         }catch (Exception e){
             e.printStackTrace();
             responseBean.addError(e.getMessage());
@@ -535,10 +538,11 @@ public class TaRecommendCustomerController extends BaseController {
     @GetMapping(value = "/admin/customer/recommend/public/get/{id}")
     public ResponseBean getPublicCustomerDetail(@PathVariable String id,
                                                 @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,HttpServletRequest request) {
+                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                @RequestParam(value ="buildingId",required = false) String buildingId,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(taRecommendCustomerService.getPublicCustomerDetail(id,pageNumber,pageSize,getTaPersonBuildingListByUserId(request)));
+            responseBean.addSuccess(taRecommendCustomerService.getPublicCustomerDetail(id,pageNumber,pageSize,getTaPersonBuildingListByUserId(request),buildingId));
         }catch (Exception e){
             e.printStackTrace();
             responseBean.addError(e.getMessage());
@@ -548,11 +552,12 @@ public class TaRecommendCustomerController extends BaseController {
 
     @GetMapping("/admin/customer/recommend/drift")
     public ResponseBean getDriftCustomerList (HttpServletRequest request,
-                                              @RequestParam(value ="buildingId",defaultValue = "false") String buildingId,
+                                              @RequestParam(value ="buildingId",defaultValue = "") String buildingId,
+                                              @RequestParam(value ="sceneType",defaultValue = "") String sceneType,
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         try{
-            return ResponseBean.success(taPersonService.getDriftCustomerList(pageNumber,pageSize,buildingId, getOrgId(request)));
+            return ResponseBean.success(taPersonService.getDriftCustomerList(pageNumber,pageSize,buildingId, getOrgId(request),sceneType));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);

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

@@ -4,6 +4,7 @@ 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.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TdReport;
 import com.huiju.estateagents.service.ITdReportService;
 import io.swagger.annotations.Api;
@@ -60,6 +61,7 @@ public class TdReportController extends BaseController {
             //使用分页插件
 		    IPage<TdReport> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TdReport> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TdReport> result = iTdReportService.page(pg, queryWrapper);

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

@@ -0,0 +1,143 @@
+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.TdWxDict;
+import com.huiju.estateagents.service.ITdWxDictService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 微信字典表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2020-01-06
+ */
+@RestController
+@RequestMapping("/api")
+public class TdWxDictController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TdWxDictController.class);
+
+    @Autowired
+    public ITdWxDictService iTdWxDictService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/tdWxDict",method= RequestMethod.GET)
+    public ResponseBean tdWxDictList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TdWxDict> pg = new Page<>(pageNumber, pageSize);
+            QueryWrapper<TdWxDict> queryWrapper = new QueryWrapper<>();
+            queryWrapper.groupBy("scene_type");
+
+            IPage<TdWxDict> result = iTdWxDictService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tdWxDictList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param tdWxDict 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tdWxDict",method= RequestMethod.POST)
+    public ResponseBean tdWxDictAdd(@RequestBody TdWxDict tdWxDict){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTdWxDictService.save(tdWxDict)){
+                responseBean.addSuccess(tdWxDict);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tdWxDictAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/tdWxDict/{id}", method= RequestMethod.DELETE)
+    public ResponseBean tdWxDictDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTdWxDictService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tdWxDictDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param tdWxDict 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tdWxDict/{id}",method= RequestMethod.PUT)
+    public ResponseBean tdWxDictUpdate(@PathVariable Integer id,
+                                        @RequestBody TdWxDict tdWxDict){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTdWxDictService.updateById(tdWxDict)){
+                responseBean.addSuccess(tdWxDict);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tdWxDictUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/tdWxDict/{id}",method= RequestMethod.GET)
+    public ResponseBean tdWxDictGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTdWxDictService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tdWxDictDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java

@@ -12,7 +12,10 @@ import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
 import com.huiju.estateagents.drainage.service.ITaDrainageRecordService;
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
 import com.huiju.estateagents.entity.ExtendContent;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.mapper.TaMiniappMapper;
 import com.huiju.estateagents.service.IExtendContentService;
+import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import io.swagger.models.auth.In;
@@ -60,6 +63,12 @@ public class TaDrainageController extends BaseController {
     @Autowired
     public IExtendContentService iExtendContentService;
 
+    @Autowired
+    private TaMiniappMapper taMiniappMapper;
+
+    @Autowired
+    private IMiniAppService miniAppService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -128,6 +137,15 @@ public class TaDrainageController extends BaseController {
                 taDrainage.setStatus(CommConstant.STATUS_NORMAL);
             }
             if (iTaDrainageService.save(taDrainage)){
+                // 根据ORGID查询当前小程序表的miniapp_id
+                QueryWrapper<TaMiniapp> taMiniappQuery= new QueryWrapper<>();
+                taMiniappQuery.eq("org_id",getOrgId(request));
+                TaMiniapp taMiniapp = taMiniappMapper.selectOne(taMiniappQuery);
+                // 生成二维码
+                ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.ACTIVITY_QRCODE.replace("#0",taDrainage.getDrainageId().toString()).replace("#1","h5"),taMiniapp.getMiniappId());
+                taDrainage.setQrCode(String.valueOf(taMiniappQrcode.getData()));
+                iTaDrainageService.updateById(taDrainage);
+
                 //添加第三方appid和secret
                 TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = new TaThirdPartyMiniappConfig();
                 taThirdPartyMiniappConfig.setOrgId(getOrgId(request));

src/main/java/com/huiju/estateagents/drainage/entity/TaDrainage.java

@@ -73,7 +73,8 @@ public class TaDrainage implements Serializable {
     private String middleImg ;
     /** 状态 */
     private Integer status ;
-
+    /** 二维码*/
+    private String qrCode;
     @TableField(exist = false)
     private String appid;
     

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

@@ -198,6 +198,21 @@ public class TaBuilding implements Serializable {
      */
     private Integer mapScope;
 
+    /**
+     * 开发商
+     */
+    private String propertyDeveloper;
+
+    /**
+     * 楼栋总数
+     */
+    private Integer buildingNum;
+
+    /**
+     * 备案名
+     */
+    private String recordName;
+
     /**
      * 地图数据
      */

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

@@ -0,0 +1,49 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 渠道小程序关系表
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaChannelAppRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 关系id
+     */
+    @TableId(value = "relation_id", type = IdType.AUTO)
+    private Integer relationId;
+
+    /**
+     * 渠道id
+     */
+    private Integer channelId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+
+}

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

@@ -287,4 +287,10 @@ public class TaPerson implements Serializable {
      */
     @TableField(exist = false)
     private String personFrom;
+
+    /**
+     * 用户来源
+     */
+    @TableField(exist = false)
+    private String sceneAlias;
 }

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

@@ -85,4 +85,9 @@ public class TaPersonFromRecord implements Serializable {
      * 行为
      */
     private String activity;
+
+    /**
+     * 微信来源类型
+     */
+    private String sceneType;
 }

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

@@ -0,0 +1,45 @@
+package com.huiju.estateagents.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 微信字典表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TdWxDict implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 场景值id
+     */
+    private String sceneId;
+
+    /**
+     * 场景名称
+     */
+    private String sceneName;
+
+    /**
+     * 场景类型
+     */
+    private String sceneType;
+
+    /**
+     * 场景类型别名
+     */
+    private String sceneAlias;
+
+
+}

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

@@ -56,6 +56,7 @@ public class AccessInterceptor implements HandlerInterceptor {
             "/api/taCheckin/activity",
             "/api/wx/qrcode/scene",
 		    "/api/center/signin",
+            "/api/channel/signin",
 		    "/api/admin/taUser/signin",
             "/swagger-resources/configuration/ui",
             "/swagger-resources",

src/main/java/com/huiju/estateagents/job/CustomerStatisticTimeJob.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.job;
 
 import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.service.ITaPersonFromRecordService;
 import com.huiju.estateagents.statistic.service.ITsCustomerGenderStatisticService;
 import com.huiju.estateagents.statistic.service.ITsCustomerStatisticDailyService;
 import com.huiju.estateagents.statistic.service.ITsCustomerStatisticMonthlyService;
@@ -36,6 +37,9 @@ public class CustomerStatisticTimeJob extends BaseController {
     @Autowired
     private ITsCustomerStatisticMonthlyService customerStatisticMonthlyService;
 
+    @Autowired
+    public ITaPersonFromRecordService iTaPersonFromRecordService;
+
     /**
      *
      * 盘客工具数据统计
@@ -43,36 +47,39 @@ public class CustomerStatisticTimeJob extends BaseController {
      * 开启定时任务，每天23:50执行
      */
     @Scheduled(cron = "59 50 23 * * ?")
-    //@Scheduled(cron = "* 0/5 * * * ?")
+//    @Scheduled(cron = "* 0/1 * * * ?")
     private void configureTasks() {
         LocalDateTime nowDate = LocalDateTime.now();
-    
+
         //每天的新增客户统计并入表
         customerStatisticDailyService.newCustomerStatisticDaily(nowDate);
-        
+
         //每天的跟进客户统计并入表
         customerStatisticDailyService.followUpStatisticDaily(nowDate);
-        
+
         //每天的到访客户统计并入表
         customerStatisticDailyService.visiteStatisticDaily(nowDate);
-    
+
         //每天的新增客户性别统计并入表
         taCustomerGenderStatisticService.newCustomerSexStatisticDaily(nowDate);
-    
+
         //每天的跟进客户性别统计并入表
         taCustomerGenderStatisticService.followUpSexStatisticDaily(nowDate);
-    
+
         //每天的到访客户性别统计并入表
         taCustomerGenderStatisticService.visiteSexStatisticDaily(nowDate);
-    
+
         //每月的新增客户统计并入表,但是每天都更新
         customerStatisticMonthlyService.newCustomerStatisticMonthly(nowDate);
-    
+
         //每月的跟进客户统计并入表,但是每天都更新
         customerStatisticMonthlyService.followUpStatisticMonthly(nowDate);
-    
+
         //每月的到访客户统计并入表,但是每天都更新
         customerStatisticMonthlyService.visiteStatisticMonthly(nowDate);
+
+        //统计新增来源用户
+        iTaPersonFromRecordService.personFromStatistic();
     }
 
 }

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaChannelAppRelation;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 渠道小程序关系表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-04
+ */
+@Mapper
+public interface TaChannelAppRelationMapper extends BaseMapper<TaChannelAppRelation> {
+
+}

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

@@ -2,8 +2,11 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaPersonFromRecord;
+import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 新增用户来源表  Mapper 接口
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaPersonFromRecordMapper extends BaseMapper<TaPersonFromRecord> {
 
+    List<TsPersonFromStatistic> getNowDataList();
 }

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

@@ -67,6 +67,22 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
     @Select("select count(1) from ta_person where org_id = #{org} AND person_type IN ('customer','drift','estate agent') and phone is not null")
     Integer selectRegisteredCount(@Param("org") Integer orgId);
 
+    /**
+     * 渠道代理后台总用户数
+     * @return
+     */
+    @ResultType(Integer.class)
+    @Select("select count(1) from ta_person where org_id = #{org}")
+    Integer selectChannelUserCount(@Param("org") String orgId);
+
+    /**
+     * 渠道代理后台总注册数
+     * @return
+     */
+    @ResultType(Integer.class)
+    @Select("select count(1) from ta_person where org_id = #{org} and phone is not null")
+    Integer selectChannelRegisteredCount(@Param("org") String orgId);
+
     /**
      * 根据时间段查询
      * @param personType
@@ -203,4 +219,6 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @return
      */
     Integer judgeBindStatusByCondition(@Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("phone") String phone);
+
+    IPage<TaPerson> selectDriftCustomerPageList(IPage<TaPerson> page,@Param("buildingId") String buildingId,@Param("orgId") Integer orgId,@Param("personEstateDrift") String personEstateDrift,@Param("sceneType") String sceneType);
 }

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

@@ -27,7 +27,7 @@ import java.util.List;
 @Mapper
 public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecord> {
 
-    IPage<TaPersonVisitRecord> visitRecordByPersonId(IPage<TaPersonVisitRecord> page,@Param("personId") String personId);
+    IPage<TaPersonVisitRecord> visitRecordByPersonId(IPage<TaPersonVisitRecord> page,@Param("personId") String personId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("buildingId") String buildingId);
 
     Integer getDurationByPersonId(@Param("personId") String personId);
 

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

@@ -33,7 +33,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     TaRecommendCustomer getCustomerById(@Param("customerId")String customerId);
 
-    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("status")Integer status, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("status")Integer status, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("sceneType") String sceneType);
     IPage<TaRecommendCustomer> getRecCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
     IPage<TaRecommendCustomer> getRepCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
     IPage<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel, @Param("orgId") Integer orgId);
@@ -48,7 +48,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param sex
      * @return
      */
-    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("consultTel")String consultTel);
+    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("consultTel")String consultTel,@Param("sceneType") String sceneType);
 
     /**
      * 导出数据 获取推荐用户数据

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TdWxDict;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 微信字典表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-06
+ */
+@Mapper
+public interface TdWxDictMapper extends BaseMapper<TdWxDict> {
+
+}

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

@@ -106,4 +106,13 @@ public interface IStatisticalService {
      * @return
      */
     ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId);
+
+    /**
+     * 用户来源数据 首页
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    ResponseBean selectPersonFrom(Integer orgId, LocalDate startDate, LocalDate endDate);
 }

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaChannelAppRelation;
+
+/**
+ * <p>
+ * 渠道小程序关系表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-04
+ */
+public interface ITaChannelAppRelationService extends IService<TaChannelAppRelation> {
+
+}

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

@@ -13,5 +13,5 @@ import com.huiju.estateagents.entity.TaMiniapp;
  */
 public interface ITaMiniappService extends IService<TaMiniapp> {
 
-    TaMiniapp saveInfoWithTpls(TaMiniapp taMiniapp) throws Exception;
+    TaMiniapp saveInfoWithTpls(TaMiniapp taMiniapp, Integer channelId) throws Exception;
 }

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

@@ -15,4 +15,9 @@ import com.huiju.estateagents.entity.TaPersonVisitRecord;
 public interface ITaPersonFromRecordService extends IService<TaPersonFromRecord> {
 
     void addNewPersonRecordRecord(TaPersonVisitRecord taPersonVisitRecord);
+
+    /**
+     * 定时任务批量保存数据
+     */
+    void personFromStatistic();
 }

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

@@ -57,7 +57,7 @@ public interface ITaPersonService extends IService<TaPerson> {
 
     List<TaPerson> getPersonsByOpenId(String openid);
 
-    IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building, Integer orgId);
+    IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building, Integer orgId, String sceneType);
 
     String getPersonIdByCustomerId(String customerId);
 

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

@@ -35,7 +35,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
 
-    IPage getCustomerList(Integer status,int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
+    IPage getCustomerList(Integer status,int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId,List<TaPersonBuilding> taPersonBuildingList,String sceneType);
 
     IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
 
@@ -44,9 +44,9 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
     IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel, Integer orgId);
 
 
-    TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList);
+    TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId);
 
-    TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList);
+    TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId);
 
     TaRecommendCustomer getCustomerById(String customerId);
 

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TdWxDict;
+
+/**
+ * <p>
+ * 微信字典表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-06
+ */
+public interface ITdWxDictService extends IService<TdWxDict> {
+
+}

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

@@ -9,6 +9,8 @@ import com.huiju.estateagents.exception.EstaException;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.po.PersonPO;
 import com.huiju.estateagents.service.IStatisticalService;
+import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
+import com.huiju.estateagents.statistic.mapper.TsPersonFromStatisticMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -42,6 +44,9 @@ public class StatisticalServiceImpl implements IStatisticalService {
     @Autowired
     private TaPersonIntentionRecordMapper taPersonIntentionRecordMapper;
 
+    @Autowired
+    private TsPersonFromStatisticMapper tsPersonFromStatisticMapper;
+
 
     @Override
     public ResponseBean indexStatistical(Integer orgId) {
@@ -302,4 +307,18 @@ public class StatisticalServiceImpl implements IStatisticalService {
         responseBean.addSuccess(page);
         return responseBean;
     }
+
+    /**
+     * 用户来源数据 首页
+     *
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    @Override
+    public ResponseBean selectPersonFrom(Integer orgId, LocalDate startDate, LocalDate endDate) {
+        List<TsPersonFromStatistic> list = tsPersonFromStatisticMapper.selectPersonFrom(orgId,startDate,endDate);
+        return null;
+    }
 }

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

@@ -902,7 +902,10 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         queryWrapper.eq("building_id", taBuilding.getBuildingId());
         queryWrapper.eq("org_id", orgId);
         TaBuilding info = taBuildingMapper.selectOne(queryWrapper);
-        if (operte.equals("update") && (taBuilding.getIsMain() != 1 || info.getStatus() == 2)){
+        if (taBuilding.getIsMain() != 1){
+            return true;
+        }
+        if (operte.equals("update") && (info.getStatus() == 2)){
             return true;
         }
         if (operte.equals("updateStatus") && status == 2){

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaChannelAppRelation;
+import com.huiju.estateagents.mapper.TaChannelAppRelationMapper;
+import com.huiju.estateagents.service.ITaChannelAppRelationService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 渠道小程序关系表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-04
+ */
+@Service
+public class TaChannelAppRelationServiceImpl extends ServiceImpl<TaChannelAppRelationMapper, TaChannelAppRelation> implements ITaChannelAppRelationService {
+
+}

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

@@ -3,10 +3,14 @@ package com.huiju.estateagents.service.impl;
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
+import com.huiju.estateagents.channel.sysChannel.mapper.TaChannelProxyMapper;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.common.WxUtils;
+import com.huiju.estateagents.entity.TaChannelAppRelation;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaMiniappTemplate;
+import com.huiju.estateagents.mapper.TaChannelAppRelationMapper;
 import com.huiju.estateagents.mapper.TaMiniappMapper;
 import com.huiju.estateagents.mapper.TaMiniappTemplateMapper;
 import com.huiju.estateagents.service.ITaMiniappService;
@@ -14,6 +18,8 @@ import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 小程序表  服务实现类
@@ -30,8 +36,14 @@ public class TaMiniappServiceImpl extends ServiceImpl<TaMiniappMapper, TaMiniapp
     @Autowired
     WxUtils wxUtils;
 
+    @Autowired
+    private TaChannelAppRelationMapper taChannelAppRelationMapper;
+
+    @Autowired
+    private TaChannelProxyMapper taChannelProxyMapper;
+
     @Override
-    public TaMiniapp saveInfoWithTpls(TaMiniapp taMiniapp) throws Exception {
+    public TaMiniapp saveInfoWithTpls(TaMiniapp taMiniapp, Integer channelId) throws Exception {
         if (StringUtils.isEmpty(taMiniapp.getMiniappId())) {
             throw new Exception("请填写小程序 AppID");
         }
@@ -48,6 +60,26 @@ public class TaMiniappServiceImpl extends ServiceImpl<TaMiniappMapper, TaMiniapp
             throw new Exception("未知的小程序所属对象");
         }
 
+        //判断渠道端新增小程序最大数
+        QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
+        taChannelProxyQueryWrapper.eq("channel_id", channelId);
+        TaChannelProxy taChannelProxy = taChannelProxyMapper.selectOne(taChannelProxyQueryWrapper);
+
+        QueryWrapper<TaChannelAppRelation> relationQueryWrapper = new QueryWrapper<>();
+        relationQueryWrapper.eq("channel_id", channelId);
+        Integer miniAppCount = taChannelAppRelationMapper.selectCount(relationQueryWrapper);
+        if (miniAppCount >= taChannelProxy.getAppMaxNum()){
+            throw new Exception("当前系统仅供维护"+ taChannelProxy.getAppMaxNum() +"个小程序，需要维护更多项目，请联系相关管理人员");
+        }
+
+        //维护渠道和小程序关系
+        TaChannelAppRelation taChannelAppRelation = new TaChannelAppRelation();
+        taChannelAppRelation.setChannelId(channelId);
+        taChannelAppRelation.setOrgId(taMiniapp.getOrgId());
+        taChannelAppRelation.setCreateTime(LocalDateTime.now());
+        taChannelAppRelationMapper.insert(taChannelAppRelation);
+
+
         TaMiniapp orign = this.getById(taMiniapp.getMiniappId());
         if (null != orign) {
             if (!this.updateById(taMiniapp)) {

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

@@ -6,10 +6,13 @@ import com.huiju.estateagents.entity.TaPersonFromRecord;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import com.huiju.estateagents.mapper.TaPersonFromRecordMapper;
 import com.huiju.estateagents.service.ITaPersonFromRecordService;
+import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
+import com.huiju.estateagents.statistic.mapper.TsPersonFromStatisticMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -25,6 +28,9 @@ public class TaPersonFromRecordServiceImpl extends ServiceImpl<TaPersonFromRecor
     @Autowired
     private TaPersonFromRecordMapper taPersonFromRecordMapper;
 
+    @Autowired
+    private TsPersonFromStatisticMapper tsPersonFromStatisticMapper;
+
     /**
      * 通過買點表清洗數據
      * @param taPersonVisitRecord
@@ -53,4 +59,13 @@ public class TaPersonFromRecordServiceImpl extends ServiceImpl<TaPersonFromRecor
         }
         taPersonFromRecordMapper.insert(taPersonFromRecord);
     }
+
+    /**
+     * 定时任务批量保存数据
+     */
+    @Override
+    public void personFromStatistic() {
+        List<TsPersonFromStatistic> list =  taPersonFromRecordMapper.getNowDataList();
+        tsPersonFromStatisticMapper.insertStatisticList(list);
+    }
 }

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

@@ -737,7 +737,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building, Integer orgId){
+    public IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building, Integer orgId,String sceneType){
         QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("person_type",CommConstant.PERSON_ESTATE_DRIFT);
         if(building.equals("") && null != building){
@@ -746,7 +746,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         queryWrapper.eq(orgId != null, "org_id", orgId);
         queryWrapper.orderByDesc("create_date");
         IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
-        return taPersonMapper.selectPage(page,queryWrapper);
+        return taPersonMapper.selectDriftCustomerPageList(page,building,orgId,CommConstant.PERSON_ESTATE_DRIFT,sceneType);
     }
 
     @Override

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

@@ -480,55 +480,17 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage getCustomerList(Integer status,int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId,List<TaPersonBuilding> taPersonBuildingList){
+    public IPage getCustomerList(Integer status,int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId,List<TaPersonBuilding> taPersonBuildingList,String sceneType){
 
         if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
-
-            /**
-             * <if test="buildingId != null">
-             *             ,(select tpp.name from ta_share_person_from tspf left join ta_person tpp on  tspf.share_person = tpp.person_id where tspf.building_id = #{buildingId} and tspf.is_first_time = 1) as sharePersonName
-             *         </if>
-             */
-
-            /**
-             * SELECT
-             *         b.*
-             *         FROM
-             *         ta_person b
-             *         <where>
-             *             b.status > 0
-             *             AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
-             *             <if test="name != null and name !=''">
-             *                 and b.nickname like CONCAT('%',#{name}, '%')
-             *             </if>
-             *             <if test="tel != null and tel!=''">
-             *                 and b.phone like CONCAT('%',#{tel}, '%')
-             *             </if>
-             *             <if test="entryType != null and entryType !=''">
-             *                 and b.entry_type = #{entryType}
-             *             </if>
-             *             <if test="sex != null and sex !=''">
-             *                 and b.sex = #{sex}
-             *             </if>
-             *             <if test="orgId != null">
-             *                 and b.org_id = #{orgId}
-             *             </if>
-             *             <if test="consultTel != null and consultTel !=''">
-             *                 and b.tel like CONCAT('%',#{consultTel}, '%')
-             *             </if>
-             *             and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
-             *         </where>
-             *         order by b.create_date desc
-             */
-
             // 公客
             IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
             // 公客就不用 buildingId 进行查询
-            return taRecommendCustomerMapper.getPublicCustomerList(page,name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
+            return taRecommendCustomerMapper.getPublicCustomerList(page,name, tel,  entryType, verifyStatus, sex, orgId,consultTel,sceneType);
         } else {
             // 私客
             IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,taPersonBuildingList);
+            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,taPersonBuildingList,sceneType);
         }
 
     }
@@ -559,13 +521,13 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
 
     @Override
-    public TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList){
+    public TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId){
         String personId = taRecommendCustomerMapper.getCustomerById(customerId).getPersonId();
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getCustomerDetail(customerId,personId);
         TaPerson person = taPersonMapper.selectById(personId);
         if(!StringUtils.isEmpty(personId)){
             IPage<TaPersonVisitRecord>page = new Page<>(pageNumber,pageSize);
-            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page,personId);
+            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page,personId,taPersonBuildingList,buildingId);
             List<TaPersonVisitRecord> records = taPersonVisitRecordIPage.getRecords();
             records.forEach(e -> {
                 //获取活动标题
@@ -649,11 +611,11 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList){
+    public TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId){
         TaPerson taRecommendCustomer = taPersonMapper.getById(personId);
         if(!StringUtils.isEmpty(personId)){
             IPage<TaPersonVisitRecord>page = new Page<>(pageNumber,pageSize);
-            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page,personId);
+            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page,personId,taPersonBuildingList,buildingId);
             List<TaPersonVisitRecord> records = taPersonVisitRecordIPage.getRecords();
             records.forEach(e -> {
                 //获取活动标题

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TdWxDict;
+import com.huiju.estateagents.mapper.TdWxDictMapper;
+import com.huiju.estateagents.service.ITdWxDictService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 微信字典表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-06
+ */
+@Service
+public class TdWxDictServiceImpl extends ServiceImpl<TdWxDictMapper, TdWxDict> implements ITdWxDictService {
+
+}

src/main/java/com/huiju/estateagents/statistic/controller/TsPersonFromStatisticController.java

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.statistic.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.statistic.entity.TsPersonFromStatistic;
+import com.huiju.estateagents.statistic.service.ITsPersonFromStatisticService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 用户来源统计表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2020-01-04
+ */
+@RestController
+@RequestMapping("/")
+public class TsPersonFromStatisticController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TsPersonFromStatisticController.class);
+
+    @Autowired
+    public ITsPersonFromStatisticService iTsPersonFromStatisticService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/tsPersonFromStatistic",method= RequestMethod.GET)
+    public ResponseBean tsPersonFromStatisticList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TsPersonFromStatistic> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TsPersonFromStatistic> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TsPersonFromStatistic> result = iTsPersonFromStatisticService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsPersonFromStatisticList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param tsPersonFromStatistic 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tsPersonFromStatistic",method= RequestMethod.POST)
+    public ResponseBean tsPersonFromStatisticAdd(@RequestBody TsPersonFromStatistic tsPersonFromStatistic){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTsPersonFromStatisticService.save(tsPersonFromStatistic)){
+                responseBean.addSuccess(tsPersonFromStatistic);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsPersonFromStatisticAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/tsPersonFromStatistic/{id}", method= RequestMethod.DELETE)
+    public ResponseBean tsPersonFromStatisticDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTsPersonFromStatisticService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsPersonFromStatisticDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param tsPersonFromStatistic 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tsPersonFromStatistic/{id}",method= RequestMethod.PUT)
+    public ResponseBean tsPersonFromStatisticUpdate(@PathVariable Integer id,
+                                        @RequestBody TsPersonFromStatistic tsPersonFromStatistic){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTsPersonFromStatisticService.updateById(tsPersonFromStatistic)){
+                responseBean.addSuccess(tsPersonFromStatistic);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsPersonFromStatisticUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/tsPersonFromStatistic/{id}",method= RequestMethod.GET)
+    public ResponseBean tsPersonFromStatisticGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTsPersonFromStatisticService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsPersonFromStatisticDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/statistic/entity/TsPersonFromStatistic.java

@@ -0,0 +1,62 @@
+package com.huiju.estateagents.statistic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 用户来源统计表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TsPersonFromStatistic implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "person_from_statistic_id", type = IdType.AUTO)
+    private Integer personFromStatisticId;
+
+    /**
+     * 场景类型
+     */
+    private String sceneType;
+
+    /**
+     * 事件类型
+     */
+    private String eventType;
+
+    /**
+     * 来源数量
+     */
+    private Integer fromNum;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 注册数量
+     */
+    private Integer registeredNum;
+}

src/main/java/com/huiju/estateagents/statistic/mapper/TsPersonFromStatisticMapper.java

@@ -0,0 +1,24 @@
+package com.huiju.estateagents.statistic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户来源统计表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-04
+ */
+@Mapper
+public interface TsPersonFromStatisticMapper extends BaseMapper<TsPersonFromStatistic> {
+
+    void insertStatisticList(List<TsPersonFromStatistic> list);
+
+    List<TsPersonFromStatistic> selectPersonFrom(Integer orgId, LocalDate startDate, LocalDate endDate);
+}

src/main/java/com/huiju/estateagents/statistic/service/ITsPersonFromStatisticService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.statistic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
+
+/**
+ * <p>
+ * 用户来源统计表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-04
+ */
+public interface ITsPersonFromStatisticService extends IService<TsPersonFromStatistic> {
+
+}

src/main/java/com/huiju/estateagents/statistic/service/impl/TsPersonFromStatisticServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.statistic.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
+import com.huiju.estateagents.statistic.mapper.TsPersonFromStatisticMapper;
+import com.huiju.estateagents.statistic.service.ITsPersonFromStatisticService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户来源统计表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-04
+ */
+@Service
+public class TsPersonFromStatisticServiceImpl extends ServiceImpl<TsPersonFromStatisticMapper, TsPersonFromStatistic> implements ITsPersonFromStatisticService {
+
+}

src/main/resources/mapper/TaChannelAppRelationMapper.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.TaChannelAppRelationMapper">
+
+</mapper>

src/main/resources/mapper/TaChannelProxyMapper.xml

@@ -0,0 +1,8 @@
+<?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.channel.sysChannel.mapper.TaChannelProxyMapper">
+
+    <select id="getChannelList" resultType="com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy">
+        select * from ta_channel_proxy t
+    </select>
+</mapper>

src/main/resources/mapper/TaPersonFromRecordMapper.xml

@@ -2,4 +2,23 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaPersonFromRecordMapper">
 
+    <select id="getNowDataList" resultType="com.huiju.estateagents.statistic.entity.TsPersonFromStatistic">
+        SELECT
+            count( 1 ) AS from_num,
+            t.scene_type,
+            t.event_type,
+            t.org_id,
+            t.create_date,
+            sum( IF ( p.photo IS NOT NULL OR p.tel IS NOT NULL, 1, 0 ) ) AS registered_num
+        FROM
+            ta_person_from_record t
+            LEFT JOIN ta_person p ON t.person_id = p.person_id
+        WHERE
+            t.is_first_time = 1
+            AND DATE_FORMAT( t.create_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW( ), '%Y-%m-%d' )
+        GROUP BY
+            t.scene_type,
+            t.event_type,
+            t.org_id
+    </select>
 </mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -556,4 +556,23 @@ FROM
         LEFT JOIN ta_person b on a.user_id = b.user_id
         where a.org_id = #{orgId} and b.user_id = #{userId} and a.phone = #{phone} and a.is_consultant = '1'
     </select>
+
+    <select id="selectDriftCustomerPageList" resultType="com.huiju.estateagents.entity.TaPerson">
+        SELECT
+           t.* ,d.scene_type,d.scene_alias
+        FROM
+            ta_person t
+            LEFT JOIN ta_person_from_record r ON t.person_id = r.person_id AND r.is_first_time = 1 and r.org_id = #{orgId}
+            left join td_wx_dict d on r.scene_id = d.scene_id
+        WHERE
+            t.org_id = #{orgId}
+        and t.person_type = #{personEstateDrift}
+        <if test="buildingId !=null and buildingId !=''">
+            and t.building_id = #{buildingId}
+        </if>
+        <if test="sceneType !=null and sceneType !=''">
+            and d.scene_type = #{sceneType}
+        </if>
+        order by t.create_date desc
+    </select>
 </mapper>

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -23,9 +23,18 @@
     </sql>
 
     <select id="visitRecordByPersonId" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
-        select * from ta_person_visit_record
-        where person_id = #{personId}
-        order by visit_time desc
+        select * from ta_person_visit_record t
+        where t.person_id = #{personId}
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND t.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            AND t.building_id = #{buildingId}
+        </if>
+        order by t.visit_time desc
     </select>
 
     <select id="selectAll" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -171,6 +171,11 @@ FROM
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
         LEFT JOIN ta_person c on a.recommend_person = c.person_id
         LEFT JOIN ta_user d on d.user_id = a.realty_consultant
+        LEFT JOIN ta_person_from_record p ON a.person_id = p.person_id AND p.is_first_time = 1
+        <if test="orgId != null">
+            and p.org_id =  #{orgId}
+        </if>
+        LEFT JOIN td_wx_dict w ON p.scene_id = w.scene_id
         <where>
             a.status > 0
             and a.verify_status = 1
@@ -212,6 +217,9 @@ FROM
                     #{personBuilding.buildingId}
                 </foreach>
             </if>
+            <if test="sceneType !=null and sceneType !=''">
+                and p.scene_type = #{sceneType}
+            </if>
         </where>
         order by a.create_date desc
     </select>
@@ -244,6 +252,8 @@ FROM
         ) AS sharePersonName
         FROM
         ta_person b
+        LEFT JOIN ta_person_from_record r ON b.person_id = r.person_id AND r.is_first_time = 1 and r.org_id = #{orgId}
+        left join td_wx_dict d on r.scene_id = d.scene_id
         <where>
             b.status > 0
             and b.org_id = #{orgId}
@@ -252,6 +262,9 @@ FROM
             <if test="name != null and name !=''">
                 and b.nickname like CONCAT('%',#{name}, '%')
             </if>
+            <if test="sceneType !=null and sceneType !=''">
+                and d.scene_type = #{sceneType}
+            </if>
             <if test="tel != null and tel!=''">
                 and b.phone like CONCAT('%',#{tel}, '%')
             </if>
@@ -612,7 +625,7 @@ FROM
         b.tel as consultTel
         FROM
         ta_recommend_customer a
-        LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+        LEFT JOIN ta_person b ON (a.realty_consultant = b.person_id or a.realty_consultant = b.user_id)
         LEFT JOIN ta_person c on a.recommend_person = c.person_id
         <where>
             a.status > 0

src/main/resources/mapper/TaUserMapper.xml

@@ -20,13 +20,20 @@
             m.secret,
             m.token,
             m.NAME AS miniappName,
-            m.qr_code AS qrCode
+            m.qr_code AS qrCode,
+            z.expire_date,
+            m.org_id
         FROM
             ta_user t
             LEFT JOIN ta_org o ON t.org_id = o.org_id
             LEFT JOIN ta_miniapp m ON o.org_id = m.org_id
+            left join ta_channel_app_relation n on m.org_id = n.org_id
+            left join ta_channel_proxy z on z.channel_id = n.channel_id
         WHERE
             t.is_admin =1
+            <if test="channelId != null and channelId != ''">
+                and n.channel_id = #{channelId}
+            </if>
     </select>
 
     <select id="getTagsList" resultType="com.huiju.estateagents.center.taUser.entity.TaTags">

src/main/resources/mapper/TdWxDictMapper.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.TdWxDictMapper">
+
+</mapper>

src/main/resources/mapper/statistic/TsPersonFromStatisticMapper.xml

@@ -0,0 +1,25 @@
+<?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.statistic.mapper.TsPersonFromStatisticMapper">
+
+    <insert id="insertStatisticList">
+        INSERT INTO ts_person_from_statistic(scene_type,event_type,from_num,org_id,create_date,registered_num)
+        VALUES
+        <foreach collection="list" item="item" separator=",">
+            (#{item.sceneType},#{item.eventType},#{item.fromNum},#{item.orgId},#{item.createDate},#{item.registeredNum})
+        </foreach>
+    </insert>
+    <select id="selectPersonFrom" resultType="com.huiju.estateagents.statistic.entity.TsPersonFromStatistic">
+        SELECT
+            *
+        FROM
+        ta_person_from_record tp
+        where tp.org_id = #{org}
+        <if test="startDate != null or endDate != null">
+            AND  tp.create_date BETWEEN #{startDate} and #{endDate}
+        </if>
+        <if test="startDate == null or endDate == null">
+            AND tp.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
+        </if>
+    </select>
+</mapper>