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

# Conflicts:
#	src/main/java/com/huiju/estateagents/common/CommConstant.java

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;
@@ -88,16 +90,16 @@ 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);
 		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,231 @@
+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;
+            }
+
+            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

@@ -545,4 +545,14 @@ public class CommConstant {
      * 进入小程序
      */
     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/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/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/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/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/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/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/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/TaRecommendCustomerMapper.xml

@@ -612,7 +612,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,19 @@
             m.secret,
             m.token,
             m.NAME AS miniappName,
-            m.qr_code AS qrCode
+            m.qr_code AS qrCode,
+            z.expire_date
         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">