merge

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v2.5.1</version>
+	<version>v3.5.1</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 
@@ -108,6 +108,27 @@
 			<artifactId>guava</artifactId>
 			<version>26.0-jre</version>
 		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.alibaba/easyexcel -->
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>easyexcel</artifactId>
+			<version>2.0.4</version>
+		</dependency>
+
+		<!-- swagger2 -->
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger2</artifactId>
+			<version>2.7.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger-ui</artifactId>
+			<version>2.7.0</version>
+		</dependency>
+
 	</dependencies>
 
 	<profiles>
@@ -150,12 +171,6 @@
 				<profiles.active>nj</profiles.active>
 			</properties>
 		</profile>
-		<profile>
-			<id>hj</id>
-			<properties>
-				<profiles.active>hj</profiles.active>
-			</properties>
-		</profile>
 		<profile>
 			<id>gzysd</id>
 			<properties>
@@ -163,9 +178,9 @@
 			</properties>
 		</profile>
 		<profile>
-			<id>jj</id>
+			<id>v3</id>
 			<properties>
-				<profiles.active>jj</profiles.active>
+				<profiles.active>v3</profiles.active>
 			</properties>
 		</profile>
 	</profiles>
@@ -183,7 +198,7 @@
 				<includes>
 					<include>application.yml</include>
 					<include>application-${profiles.active}.yml</include>
-					<include>mapper/*.xml</include>
+					<include>mapper/**/*.xml</include>
 				</includes>
 			</resource>
 		</resources>

src/main/java/com/huiju/estateagents/activity/controller/ActivityController.java

@@ -0,0 +1,81 @@
+package com.huiju.estateagents.activity.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.activity.service.ActivityServiceI;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaRecommendCustomer;
+import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.ITaRecommendCustomerService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @author FXF
+ * @date 2019-10-21
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "所有活动", tags = "所有活动")
+public class ActivityController extends BaseController {
+	
+	@Autowired
+	private ActivityServiceI activityService;
+	
+	@Autowired
+	private ITaPersonService taPersonService;
+	
+	@Autowired
+	ITaRecommendCustomerService taRecommendCustomerService;
+	
+	@RequestMapping(value = "/wx/activity/list", method = RequestMethod.GET)
+	public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
+	                                           @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
+	                                           @RequestParam(value = "cityId",required = false)Integer cityId,
+	                                           HttpServletRequest request){
+		String openid = getOpenId(request);
+		Integer orgId = getOrgId(request);
+		ResponseBean  responseBean = new ResponseBean();
+		List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+		if (null == taPersons || taPersons.size() != 1) {
+			return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+		}
+		TaPerson person = taPersons.get(0);
+		responseBean = activityService.getActivityList(pageNumber,pageSize,orgId,person,cityId);
+		
+		return responseBean;
+	}
+	
+	@RequestMapping(value = "/wx/customer/activity/list", method = RequestMethod.GET)
+	public ResponseBean wxActivityList(@RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
+	                                           @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
+	                                           @RequestParam(value = "customerId") String customerId,
+	                                           HttpServletRequest request){
+		ResponseBean  responseBean = new ResponseBean();
+		Integer orgId = getOrgId(request);
+		//查找客户信息
+		QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("customer_id",customerId);
+		TaRecommendCustomer taRecommendCustomer = taRecommendCustomerService.getOne(queryWrapper);
+		if (null == taRecommendCustomer){
+			return ResponseBean.error("验证人员信息失败",ResponseBean.ERROR_UNAVAILABLE);
+		}
+		if (null == taRecommendCustomer.getPersonId()){
+			return ResponseBean.error("验证人员信息失败",ResponseBean.ERROR_UNAVAILABLE);
+		}
+		
+		QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+		taPersonQueryWrapper.eq("person_id",taRecommendCustomer.getPersonId());
+		TaPerson person = taPersonService.getOne(taPersonQueryWrapper);
+		responseBean = activityService.getCustomerActivityList(pageNumber,pageSize,orgId,person);
+		return responseBean;
+	}
+}

src/main/java/com/huiju/estateagents/activity/entity/Activity.java

@@ -0,0 +1,37 @@
+package com.huiju.estateagents.activity.entity;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author FXF
+ * @date 2019-10-21
+ */
+@Data
+public class Activity {
+
+	private Object id;
+	
+	private String mainImg;
+	
+	private String title;
+	
+	private LocalDateTime startDate;
+	
+	private LocalDateTime endDate;
+	
+	private Integer weight;
+	
+	/**
+	 *  0：进行中 1：未开始 2：已结束 3：已参与（微信端用）
+	 */
+	private Integer activityStatus;
+	
+	private String type;
+	
+	/**
+	 * 完成数量
+	 */
+	private Integer successNum;
+}

src/main/java/com/huiju/estateagents/activity/mapper/ActivityMapper.java

@@ -0,0 +1,23 @@
+package com.huiju.estateagents.activity.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.activity.entity.Activity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface ActivityMapper {
+	List<Activity> getActivityList(Page pg, @Param("orgId") Integer orgId,@Param("status") Integer status,@Param("cityId") Integer cityId);
+	
+	/**
+	 * 获取客户参与的活动列表
+	 * @param pg
+	 * @param orgId
+	 * @param personId
+	 * @return
+	 */
+	List<Map<String,Object>> getCustomerActivityList(Page pg,@Param("orgId") Integer orgId,@Param("personId") String personId);
+}

src/main/java/com/huiju/estateagents/activity/service/ActivityServiceI.java

@@ -0,0 +1,27 @@
+package com.huiju.estateagents.activity.service;
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
+
+public interface ActivityServiceI {
+	
+	/**
+	 * 获取三个活动
+	 * @param pageNumber
+	 * @param pageSize
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	ResponseBean getActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person,Integer cityId);
+	
+	/**
+	 * 获取客户参加的活动信息
+	 * @param pageNumber
+	 * @param pageSize
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	ResponseBean getCustomerActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person);
+}

src/main/java/com/huiju/estateagents/activity/service/impl/ActivityServiceImpl.java

@@ -0,0 +1,135 @@
+package com.huiju.estateagents.activity.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.activity.entity.Activity;
+import com.huiju.estateagents.activity.mapper.ActivityMapper;
+import com.huiju.estateagents.activity.service.ActivityServiceI;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.HelpInitiateRecord;
+import com.huiju.estateagents.entity.HelpRecord;
+import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaShareRecord;
+import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
+import com.huiju.estateagents.mapper.HelpRecordMapper;
+import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
+import com.huiju.estateagents.mapper.TaShareRecordMapper;
+import io.swagger.models.auth.In;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author FXF
+ * @date 2019-10-21
+ */
+@Service
+public class ActivityServiceImpl implements ActivityServiceI {
+	
+	@Autowired
+	private ActivityMapper activityMapper;
+	
+	@Autowired
+	private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
+	
+	@Autowired
+	private TaShareRecordMapper taShareRecordMapper;
+	
+	@Autowired
+	private HelpRecordMapper helpRecordMapper;
+	
+	@Autowired
+	private HelpInitiateRecordMapper helpInitiateRecordMapper;
+	
+	/**
+	 * 获取三个活动
+	 *
+	 * @param pageNumber
+	 * @param pageSize
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	@Override
+	public ResponseBean getActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person, Integer cityId) {
+		//查询是否报名了普通活动
+		QueryWrapper<TaActivityDynamicEnlist> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("org_id",orgId);
+		queryWrapper.eq("person_id",person.getPersonId());
+		List<TaActivityDynamicEnlist> taActivityDynamicEnlists = taActivityDynamicEnlistMapper.selectList(queryWrapper);
+		//查询是否报名了拼团活动
+		QueryWrapper<TaShareRecord> taShareRecordQueryWrapper = new QueryWrapper<>();
+		taShareRecordQueryWrapper.eq("org_id",orgId);
+		taShareRecordQueryWrapper.eq("person_id",person.getPersonId());
+		List<TaShareRecord> taShareRecords = taShareRecordMapper.selectList(taShareRecordQueryWrapper);
+		//判断是否发起了助力活动
+		QueryWrapper<HelpInitiateRecord> helpInitiateRecordListQueryWrapper = new QueryWrapper<>();
+		helpInitiateRecordListQueryWrapper.eq("org_id",orgId);
+		helpInitiateRecordListQueryWrapper.eq("person_id",person.getPersonId());
+		List<HelpInitiateRecord> HelpInitiateRecords = helpInitiateRecordMapper.selectList(helpInitiateRecordListQueryWrapper);
+		
+		//分页获取全部数据
+		Page pg = new Page(pageNumber,pageSize);
+		List<Activity> list = activityMapper.getActivityList(pg,orgId, CommConstant.STATUS_NORMAL,cityId);
+		list.forEach(e -> {
+			if (e.getType().equals("dynamic")){
+				taActivityDynamicEnlists.forEach(dynamic -> {
+					if (e.getId().equals(dynamic.getDynamicId())){
+						e.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
+					}
+				});
+				e.setSuccessNum(null);
+			}else if (e.getType().equals("group")){
+				taShareRecords.forEach(share -> {
+					if (e.getId().equals(String.valueOf(share.getGroupActivityId()))){
+						e.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
+					}
+				});
+				//查看此活动已经完成的数量
+				QueryWrapper<TaShareRecord> shareRecordQueryWrapper = new QueryWrapper<>();
+				shareRecordQueryWrapper.eq("org_id",orgId);
+				shareRecordQueryWrapper.eq("group_activity_id",e.getId());
+				shareRecordQueryWrapper.eq("status",CommConstant.STATUS_UNACCALIMED);
+				List<TaShareRecord> taShareRecordsList = taShareRecordMapper.selectList(shareRecordQueryWrapper);
+				e.setSuccessNum(taShareRecordsList.size());
+			}else if (e.getType().equals("help")){
+				HelpInitiateRecords.forEach(help -> {
+					if (e.getId().equals(help.getHelpActivityId())){
+						e.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
+					}
+				});
+				//查看此活动已经完成的数量
+				QueryWrapper<HelpInitiateRecord> helpInitiateRecordQueryWrapper = new QueryWrapper<>();
+				helpInitiateRecordQueryWrapper.eq("org_id",orgId);
+				helpInitiateRecordQueryWrapper.eq("help_activity_id",e.getId());
+				helpInitiateRecordQueryWrapper.eq("status",CommConstant.STATUS_UNACCALIMED);
+				List<HelpInitiateRecord> helpInitiateRecordList = helpInitiateRecordMapper.selectList(helpInitiateRecordQueryWrapper);
+				e.setSuccessNum(helpInitiateRecordList.size());
+			}
+		});
+		pg.setRecords(list);
+		return ResponseBean.success(pg);
+	}
+	
+	/**
+	 * 获取客户参加的活动信息
+	 *
+	 * @param pageNumber
+	 * @param pageSize
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	@Override
+	public ResponseBean getCustomerActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person) {
+		//分页获取全部数据
+		Page pg = new Page(pageNumber,pageSize);
+		List<Map<String, Object>> customerActivityList = activityMapper.getCustomerActivityList(pg, orgId, person.getPersonId());
+		pg.setRecords(customerActivityList);
+		return ResponseBean.success(pg);
+	}
+}

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

@@ -1,8 +1,62 @@
 package com.huiju.estateagents.base;
 
+import com.huiju.estateagents.common.JWTUtils;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * @author FXF
  * @date 2018-12-18
  */
 public class BaseController {
+	
+	/**
+	 * 获取orgId
+	 * @param request
+	 * @return
+	 */
+	public Integer getOrgId(HttpServletRequest request){
+		
+		Map map = JWTUtils.getUserIdAndOrgId(request);
+		if (null != map && null != map.get("orgId")){
+			return Integer.valueOf(map.get("orgId").toString());
+		}
+		
+		return null;
+	}
+
+	public String getOpenId(HttpServletRequest request){
+
+		Map map = JWTUtils.getUserIdAndOrgId(request);
+		if (null != map && null != map.get("openId")){
+			return map.get("openId").toString();
+		}
+
+		return null;
+	}
+
+	public String getPersonId(HttpServletRequest request){
+
+		Map map = JWTUtils.getUserIdAndOrgId(request);
+		if (null != map && null != map.get("personId")){
+			return map.get("personId").toString();
+		}
+
+		return null;
+	}
+	/**
+	 * 获取orgId
+	 * @param request
+	 * @return
+	 */
+	public Integer getUserId(HttpServletRequest request){
+		
+		Map map = JWTUtils.getUserIdAndOrgId(request);
+		if (null != map && null != map.get("userId")){
+			return Integer.valueOf(map.get("userId").toString());
+		}
+		
+		return null;
+	}
 }

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

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

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

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.center.sysUser.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.center.sysUser.entity.SysToken;
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
+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 2019-09-11
+ */
+@RestController
+@RequestMapping("/")
+public class SysTokenController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysTokenController.class);
+
+    @Autowired
+    public ISysTokenService iSysTokenService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/sysToken",method= RequestMethod.GET)
+    public ResponseBean sysTokenList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<SysToken> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<SysToken> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<SysToken> result = iSysTokenService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysTokenList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param sysToken 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysToken",method= RequestMethod.POST)
+    public ResponseBean sysTokenAdd(@RequestBody SysToken sysToken){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysTokenService.save(sysToken)){
+                responseBean.addSuccess(sysToken);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysTokenAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/sysToken/{id}", method= RequestMethod.DELETE)
+    public ResponseBean sysTokenDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iSysTokenService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysTokenDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param sysToken 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysToken/{id}",method= RequestMethod.PUT)
+    public ResponseBean sysTokenUpdate(@PathVariable Integer id,
+                                        @RequestBody SysToken sysToken){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysTokenService.updateById(sysToken)){
+                responseBean.addSuccess(sysToken);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysTokenUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/sysToken/{id}",method= RequestMethod.GET)
+    public ResponseBean sysTokenGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iSysTokenService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysTokenDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,217 @@
+package com.huiju.estateagents.center.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.common.CommConstant;
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.common.MD5Utils;
+import com.huiju.estateagents.common.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+    * 系统用户 系统中心账户 前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@RestController
+@RequestMapping("/api")
+public class SysUserController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysUserController.class);
+
+    @Autowired
+    public ISysUserService iSysUserService;
+    
+    @Autowired
+    private ISysTokenService sysTokenService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/sysUser",method= RequestMethod.GET)
+    public ResponseBean sysUserList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<SysUser> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<SysUser> result = iSysUserService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysUserList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param sysUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysUser",method= RequestMethod.POST)
+    public ResponseBean sysUserAdd(@RequestBody SysUser sysUser){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysUserService.save(sysUser)){
+                responseBean.addSuccess(sysUser);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysUserAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/sysUser/{id}", method= RequestMethod.DELETE)
+    public ResponseBean sysUserDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iSysUserService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param sysUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/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;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/sysUser/{id}",method= RequestMethod.GET)
+    public ResponseBean sysUserGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iSysUserService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @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);
+    }
+    
+    @PostMapping("/center/signin")
+    public ResponseBean signin(@RequestBody String paramStr) {
+        JSONObject params = JSONObject.parseObject(paramStr);
+        if (params == null) {
+            return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+        
+        String userName = params.getString("userName");
+        String userPassword = params.getString("password");
+        
+        //验证用户名密码是否正确
+        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
+        sysUserQueryWrapper.eq("user_name",userName);
+        sysUserQueryWrapper.eq("password", MD5Utils.md5(userPassword));
+        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("/center/signout")
+    public ResponseBean signout(HttpServletRequest request) {
+        String token = JWTUtils.getToken(request);
+        QueryWrapper<SysToken> sysTokenQueryWrapper = new QueryWrapper<>();
+        sysTokenQueryWrapper.eq("token",token);
+        sysTokenService.remove(sysTokenQueryWrapper);
+        return ResponseBean.success("成功退出");
+    }
+}

src/main/java/com/huiju/estateagents/center/sysUser/entity/SysToken.java

@@ -0,0 +1,38 @@
+package com.huiju.estateagents.center.sysUser.entity;
+
+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 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysToken implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * token
+     */
+    @TableId(value = "token")
+    private String token;
+
+    /**
+     * 过期时间
+     */
+    private LocalDateTime expDate;
+
+
+}

src/main/java/com/huiju/estateagents/center/sysUser/entity/SysUser.java

@@ -0,0 +1,53 @@
+package com.huiju.estateagents.center.sysUser.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;
+
+/**
+ * <p>
+ * 系统用户 系统中心账户
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 账户登录
+     */
+    @TableId(value = "user_name")
+    private String userName;
+
+    /**
+     * 登录密码
+     */
+    private String password;
+
+    /**
+     * 用户名称
+     */
+    private String name;
+
+    /**
+     * 头像
+     */
+    private String avatar;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+
+}

src/main/java/com/huiju/estateagents/center/sysUser/mapper/SysTokenMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.center.sysUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 令牌表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Mapper
+public interface SysTokenMapper extends BaseMapper<SysToken> {
+
+}

src/main/java/com/huiju/estateagents/center/sysUser/mapper/SysUserMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.center.sysUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 系统用户 系统中心账户 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Mapper
+public interface SysUserMapper extends BaseMapper<SysUser> {
+
+}

src/main/java/com/huiju/estateagents/center/sysUser/service/ISysTokenService.java

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.center.sysUser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
+
+/**
+ * <p>
+ * 令牌表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+public interface ISysTokenService extends IService<SysToken> {
+	
+	SysToken saveToken(String token);
+}

src/main/java/com/huiju/estateagents/center/sysUser/service/ISysUserService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.center.sysUser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
+
+/**
+ * <p>
+ * 系统用户 系统中心账户 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+public interface ISysUserService extends IService<SysUser> {
+
+}

src/main/java/com/huiju/estateagents/center/sysUser/service/impl/SysTokenServiceImpl.java

@@ -0,0 +1,35 @@
+package com.huiju.estateagents.center.sysUser.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
+import com.huiju.estateagents.center.sysUser.mapper.SysTokenMapper;
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 令牌表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Service
+public class SysTokenServiceImpl extends ServiceImpl<SysTokenMapper, SysToken> implements ISysTokenService {
+	
+	@Autowired
+	private SysTokenMapper sysTokenMapper;
+	
+	@Override
+	public SysToken saveToken(String token) {
+		SysToken sysToken = new SysToken();
+		sysToken.setToken(token);
+		sysToken.setExpDate(LocalDateTime.now().plusDays(7));
+		sysTokenMapper.insert(sysToken);
+		return sysToken;
+	}
+}

src/main/java/com/huiju/estateagents/center/sysUser/service/impl/SysUserServiceImpl.java

@@ -0,0 +1,21 @@
+package com.huiju.estateagents.center.sysUser.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
+import com.huiju.estateagents.center.sysUser.mapper.SysUserMapper;
+import com.huiju.estateagents.center.sysUser.service.ISysUserService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统用户 系统中心账户 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Service
+public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
+
+}

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

@@ -0,0 +1,149 @@
+package com.huiju.estateagents.center.taUser.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.center.taUser.entity.TaButtonUriMap;
+import com.huiju.estateagents.center.taUser.service.ITaButtonUriMapService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 按钮路由映射表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-26
+ */
+@RestController
+@RequestMapping("/")
+public class TaButtonUriMapController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaButtonUriMapController.class);
+
+    @Autowired
+    public ITaButtonUriMapService iTaButtonUriMapService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taButtonUriMap",method= RequestMethod.GET)
+    public ResponseBean taButtonUriMapList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaButtonUriMap> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaButtonUriMap> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaButtonUriMap> result = iTaButtonUriMapService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taButtonUriMapList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taButtonUriMap 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taButtonUriMap",method= RequestMethod.POST)
+    public ResponseBean taButtonUriMapAdd(@RequestBody TaButtonUriMap taButtonUriMap){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaButtonUriMapService.save(taButtonUriMap)){
+                responseBean.addSuccess(taButtonUriMap);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taButtonUriMapAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taButtonUriMap/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taButtonUriMapDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaButtonUriMapService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taButtonUriMapDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taButtonUriMap 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taButtonUriMap/{id}",method= RequestMethod.PUT)
+    public ResponseBean taButtonUriMapUpdate(@PathVariable Integer id,
+                                        @RequestBody TaButtonUriMap taButtonUriMap){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaButtonUriMapService.updateById(taButtonUriMap)){
+                responseBean.addSuccess(taButtonUriMap);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taButtonUriMapUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taButtonUriMap/{id}",method= RequestMethod.GET)
+    public ResponseBean taButtonUriMapGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaButtonUriMapService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taButtonUriMapDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,149 @@
+package com.huiju.estateagents.center.taUser.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.center.taUser.entity.TaTagUser;
+import com.huiju.estateagents.center.taUser.service.ITaTagUserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    *   前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+@RestController
+@RequestMapping("/")
+public class TaTagUserController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaTagUserController.class);
+
+    @Autowired
+    public ITaTagUserService iTaTagUserService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taTagUser",method= RequestMethod.GET)
+    public ResponseBean taTagUserList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaTagUser> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaTagUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaTagUser> result = iTaTagUserService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagUserList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taTagUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taTagUser",method= RequestMethod.POST)
+    public ResponseBean taTagUserAdd(@RequestBody TaTagUser taTagUser){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaTagUserService.save(taTagUser)){
+                responseBean.addSuccess(taTagUser);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagUserAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taTagUser/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taTagUserDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaTagUserService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taTagUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taTagUser/{id}",method= RequestMethod.PUT)
+    public ResponseBean taTagUserUpdate(@PathVariable Integer id,
+                                        @RequestBody TaTagUser taTagUser){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaTagUserService.updateById(taTagUser)){
+                responseBean.addSuccess(taTagUser);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagUserUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taTagUser/{id}",method= RequestMethod.GET)
+    public ResponseBean taTagUserGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaTagUserService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,150 @@
+package com.huiju.estateagents.center.taUser.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.center.taUser.entity.TaTags;
+import com.huiju.estateagents.center.taUser.service.ITaTagsService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+    *   前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+@RestController
+@RequestMapping("/api")
+public class TaTagsController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaTagsController.class);
+
+    @Autowired
+    public ITaTagsService iTaTagsService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taTags",method= RequestMethod.GET)
+    public ResponseBean taTagsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaTags> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaTags> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",getOrgId(request));
+            IPage<TaTags> result = iTaTagsService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagsList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taTags 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taTags",method= RequestMethod.POST)
+    public ResponseBean taTagsAdd(@RequestBody TaTags taTags){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaTagsService.save(taTags)){
+                responseBean.addSuccess(taTags);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagsAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taTags/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taTagsDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaTagsService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagsDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taTags 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taTags/{id}",method= RequestMethod.PUT)
+    public ResponseBean taTagsUpdate(@PathVariable Integer id,
+                                        @RequestBody TaTags taTags){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaTagsService.updateById(taTags)){
+                responseBean.addSuccess(taTags);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagsUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taTags/{id}",method= RequestMethod.GET)
+    public ResponseBean taTagsGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaTagsService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taTagsDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,68 @@
+package com.huiju.estateagents.center.taUser.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.service.ITaUserAuthButtonService;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @author weicc
+ * @Title: TaUserAuthButtonController
+ * @Description: TODO
+ * @date 2019/9/23
+ */
+@RestController
+@RequestMapping("/api")
+public class TaUserAuthButtonController extends BaseController {
+
+    @Autowired
+    public ITaUserAuthButtonService iTaUserAuthButtonService;
+
+    /**
+     * 根据userId获取菜单列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/userAuthButton",method= RequestMethod.GET)
+    public ResponseBean getButtonByUserId(HttpServletRequest servletRequest,
+                                          @RequestParam("pageNum")Integer pageNum,
+                                          @RequestParam("pageSize")Integer pageSize){
+        Integer userId = getUserId(servletRequest);
+        return iTaUserAuthButtonService.getButtonByUserId(pageNum,pageSize,userId.toString());
+    }
+
+
+    /**
+     * 获取所有的菜单按钮
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/buttonList",method= RequestMethod.GET)
+    public ResponseBean getMenuByRole(@RequestParam("pageNum")Integer pageNum,
+                                      @RequestParam("pageSize")Integer pageSize){
+        return iTaUserAuthButtonService.getAllButton(pageNum, pageSize);
+    }
+
+    /**
+     * 用户授权按钮
+     * @return
+     */
+    @RequestMapping(value="/admin/updateAuthButton",method= RequestMethod.PUT)
+    public ResponseBean updateUserAuthMenu(HttpServletRequest request,
+                                           @RequestBody String sysButton){
+        Integer userId = getUserId(request);
+        JSONObject Object = JSONObject.parseObject(sysButton);
+        JSONArray JSONArray = Object.getJSONArray("sysButton");
+        List<SysButtonInMenu> sysButtonInMenuList = JSONArray.toJavaList(SysButtonInMenu.class);
+        return iTaUserAuthButtonService.updateUserAuthButton(userId, sysButtonInMenuList);
+    }
+}

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

@@ -0,0 +1,74 @@
+package com.huiju.estateagents.center.taUser.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.google.gson.JsonArray;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+import com.huiju.estateagents.entity.SysMenu;
+import com.huiju.estateagents.entity.TaRole;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @author weicc
+ * @Title: TaUserAuthMenuController
+ * @Description: TODO
+ * @date 2019/9/21
+ */
+@RestController
+@RequestMapping("/api")
+public class TaUserAuthMenuController extends BaseController {
+
+    @Autowired
+    public ITaUserAuthMenuService iTaUserAuthMenuService;
+
+    /**
+     * 根据userId获取菜单列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/userAuthMenu",method= RequestMethod.GET)
+    public ResponseBean  getMenuByUserId(@RequestParam("pageNum")Integer pageNum,
+                                         @RequestParam("pageSize")Integer pageSize,
+                                         HttpServletRequest request){
+        Integer userId = getUserId(request);
+        return iTaUserAuthMenuService.getMenuByUserId(pageNum,pageSize,userId.toString());
+    }
+
+    /**
+     * 获取所有菜单
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/menuList",method= RequestMethod.GET)
+    public ResponseBean getMenuByRole(@RequestParam("pageNum")Integer pageNum,
+                                      @RequestParam("pageSize")Integer pageSize){
+        return iTaUserAuthMenuService.getAllMenu(pageNum, pageSize);
+    }
+
+    /**
+     * 用户授权菜单
+     * @return
+     */
+    @RequestMapping(value="/admin/updateAuthMenu",method= RequestMethod.POST)
+    public ResponseBean updateUserAuthMenu(HttpServletRequest request,
+                                           @RequestBody String sysMenu){
+        JSONObject Object = JSONObject.parseObject(sysMenu);
+        String name = Object.getString("name");
+        Integer userId = Object.getInteger("id");
+        JSONArray JSONArray = Object.getJSONArray("sysMenu");
+        List<SysMenu> sysMenuList = JSONArray.toJavaList(SysMenu.class);
+
+        JSONArray buttonArray = Object.getJSONArray("sysButton");
+        List<SysButtonInMenu> sysButtonInMenuList = buttonArray.toJavaList(SysButtonInMenu.class);
+        return iTaUserAuthMenuService.updateUserAuthMenu(userId, sysMenuList,name,getOrgId(request),sysButtonInMenuList);
+    }
+}

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

@@ -0,0 +1,483 @@
+package com.huiju.estateagents.center.taUser.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
+import com.huiju.estateagents.center.taUser.entity.TaTagUser;
+import com.huiju.estateagents.center.taUser.entity.TaTags;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.entity.TaUserRole;
+import com.huiju.estateagents.center.taUser.service.ITaTagUserService;
+import com.huiju.estateagents.center.taUser.service.ITaUserAuthButtonService;
+import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
+import com.huiju.estateagents.center.taUser.service.ITaUserRoleService;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.common.MD5Utils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+import com.huiju.estateagents.entity.SysMenu;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.entity.TaRole;
+import com.huiju.estateagents.mapper.TaRoleMapper;
+import com.huiju.estateagents.service.ITaPersonBuildingService;
+import com.huiju.estateagents.service.ITaRoleService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import sun.dc.pr.PRError;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.ws.Response;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+    * 用户表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@RestController
+@RequestMapping("/api")
+public class TaUserController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaUserController.class);
+
+    @Autowired
+    public ITaUserService iTaUserService;
+    
+    @Autowired
+    private ISysTokenService sysTokenService;
+
+    @Autowired
+    private ITaRoleService iTaRoleService;
+
+    @Autowired
+    private ITaUserAuthMenuService iTaUserAuthMenuService;
+
+    @Autowired
+    private ITaUserAuthButtonService iTaUserAuthButtonService;
+    
+    @Autowired
+    private ITaTagUserService taTagUserService;
+    
+    @Autowired
+    private ITaPersonBuildingService taPersonBuildingService;
+    
+    @Autowired
+    private ITaUserRoleService taUserRoleService;
+
+    @Autowired
+    private TaRoleMapper taRoleMapper;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/center/taUser",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<Map<String,Object>> result = iTaUserService.getPageList(pg);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/taUser",method= RequestMethod.POST)
+    public ResponseBean taUserAdd(@RequestBody TaUser taUser){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaUserService.newUserAndOrg(taUser));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    @PutMapping(value = "/{plat}/turn/taUser/{id}/{type}")
+    public ResponseBean turnUser(@PathVariable String type, @PathVariable Integer id) {
+        try {
+            iTaUserService.turnUserOnOrNot(id, "on".equals(type));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        return ResponseBean.success("ok");
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taUser/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taUserDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaUserService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/taUser/{id}",method= RequestMethod.PUT)
+    public ResponseBean taUserUpdate(@PathVariable Integer id,
+                                        @RequestBody TaUser taUser){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            iTaUserService.updateInfoWithOrg(taUser);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    /**
+     * 获取用户信息
+     */
+    @RequestMapping(value="/center/taUser/{id}",method= RequestMethod.GET)
+    public ResponseBean taUserGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaUserService.getInfoWithOrg(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+
+        return responseBean;
+    }
+
+    /**
+     * 重置密码
+     * @param plat
+     * @param id
+     * @return
+     */
+    @PutMapping(value = "/{plat}/password/taUser/{id}")
+    public ResponseBean resetPassword(@PathVariable String plat, @PathVariable Integer id, HttpServletRequest request) {
+        if (!"center".equals(plat) && !"admin".equals(plat)) {
+            return ResponseBean.error("您没有权限进行此操作", ResponseBean.ERROR_AUTH_EXPIRED);
+        }
+
+        String newPass = plat.equals("center") ? "abc@123" : "123456";
+        try {
+            iTaUserService.resetPassword(id, newPass);
+            return ResponseBean.success("新密码为: " + newPass);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+
+    /**
+     * 业务端  修改密码
+     * @return
+     */
+    @PutMapping(value = "/admin/update/password")
+    public ResponseBean updatePassword( @RequestParam String originalPassword,
+                                        @RequestParam String newPassword,
+                                        HttpServletRequest request) {
+
+        if (org.apache.commons.lang3.StringUtils.isBlank(newPassword) || newPassword.length() < 6) {
+            return ResponseBean.error("新密不能小于6位", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        Integer userId = getUserId(request);
+
+        // 校验当前旧密码是否正确
+        String password = MD5Utils.md5(MD5Utils.md5(originalPassword));
+        TaUser taUser = iTaUserService.getById(userId);
+        if (!password.equals(taUser.getLoginPassword())){
+            return ResponseBean.error("旧密码错误,请重新输入", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        try {
+            iTaUserService.resetPassword(userId, newPassword);
+            return ResponseBean.success("操作成功！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 获取当前用户信息
+     * @param request
+     * @return
+     */
+    @RequestMapping(value="/admin/taUser/current",method= RequestMethod.GET)
+    public ResponseBean taUserGetCurrent(HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        Map userMap = new HashMap();
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        try {
+            TaUser taUser = iTaUserService.getById(map.get("userId").toString());
+            List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());
+            ResponseBean authMenu = iTaUserAuthMenuService.getMenuByUserId(null, null, taUser.getUserId().toString());
+            ResponseBean authButton = iTaUserAuthButtonService.getButtonByUserId(null, null, taUser.getUserId().toString());
+            taUser.setMenus((List<SysMenu>) authMenu.getData());
+            taUser.setButtons((List<SysButtonInMenu>) authButton.getData());
+            taUser.setRoles(roles);
+            taUser.setLoginPassword("");
+
+            //获取所有菜单
+            List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null).getData();
+            List<SysButtonInMenu> allButtons = (List<SysButtonInMenu>) iTaUserAuthButtonService.getAllButton(null, null).getData();
+
+            userMap.put("taUser", taUser);
+            userMap.put("menuList", allMenus);
+            userMap.put("buttonList", allButtons);
+            responseBean.addSuccess(userMap);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 用户手机号登录
+     * @param paramStr
+     * @return
+     */
+    @PostMapping("/admin/taUser/signin")
+    public ResponseBean signin(@RequestBody String paramStr) {
+        JSONObject params = JSONObject.parseObject(paramStr);
+        if (params == null) {
+            return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+    
+        String userName = params.getString("loginName");
+        String userPassword = params.getString("loginPassword");
+    
+        //验证用户名密码是否正确
+        QueryWrapper<TaUser> sysUserQueryWrapper = new QueryWrapper<>();
+        sysUserQueryWrapper.eq("login_name",userName);
+        sysUserQueryWrapper.eq("login_password", MD5Utils.md5(userPassword));
+        TaUser taUser = iTaUserService.getOne(sysUserQueryWrapper);
+        if (taUser == null) {
+            return ResponseBean.error("用户名或密码错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+    
+        if (!taUser.getStatus().equals(CommConstant.STATUS_NORMAL) ) {
+            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());
+        taUser.setRoles(roles);
+        taUser.setLoginPassword("");
+        Map map = new HashMap();
+        map.put("userId",taUser.getUserId().toString());
+        map.put("orgId",taUser.getOrgId().toString());
+        String token = JWTUtils.newTokenByMap(map);
+
+        // 先尝试删除这个Token
+        // 因为偶尔出现了，Token插入失败，报的错就是主键重复
+        sysTokenService.removeById(token);
+
+        //保存token
+        sysTokenService.saveToken(token);
+    
+        Map<String, Object> result = new HashMap<>();
+        result.put("token", token);
+        result.put("user", taUser);
+    
+        return ResponseBean.success(result);
+    }
+    
+    @PostMapping("/admin/taUser/signout")
+    public ResponseBean signout(HttpServletRequest request) {
+        String token = JWTUtils.getToken(request);
+        QueryWrapper<SysToken> sysTokenQueryWrapper = new QueryWrapper<>();
+        sysTokenQueryWrapper.eq("token",token);
+        sysTokenService.remove(sysTokenQueryWrapper);
+        return ResponseBean.success("成功退出");
+    }
+    
+    
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taUser",method= RequestMethod.GET)
+    public ResponseBean taUserList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                   @RequestParam(value ="userName",required = false) String userName,
+                                   @RequestParam(value ="phone",required = false) String phone,
+                                   @RequestParam(value ="status",required = false) Integer status,
+                                   @RequestParam(value ="isConsultant",required = false) Integer isConsultant,
+                                   HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
+            taUserQueryWrapper.eq("org_id",getOrgId(request));
+            taUserQueryWrapper.like(!StringUtils.isEmpty(userName),"user_name",userName);
+            taUserQueryWrapper.like(!StringUtils.isEmpty(phone),"phone",phone);
+            taUserQueryWrapper.eq(null != status,"status",status);
+            if(null != isConsultant && isConsultant == 1){
+                taUserQueryWrapper.eq("is_consultant",true);
+            }
+            taUserQueryWrapper.ne("IFNULL(is_admin,0)",CommConstant.STATUS_NORMAL);
+            IPage<TaUser> result = iTaUserService.page(pg,taUserQueryWrapper);
+            List<TaUser> taUserList = result.getRecords();
+            taUserList.forEach(e -> {
+                List<TaTags> taTagsList = iTaUserService.getTagsList(e);
+                e.setTaTagsList(taTagsList);
+            });
+            result.setRecords(taUserList);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    
+    /**
+     * 获取用户信息
+     */
+    @RequestMapping(value="/admin/taUser/{id}",method= RequestMethod.GET)
+    public ResponseBean adminUserGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaUser taUser = iTaUserService.getById(id);
+            QueryWrapper<TaTagUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("user_id",id);
+            List<TaTagUser> taTagUserList = taTagUserService.list(queryWrapper);
+            List<Integer> tags = new ArrayList<>();
+            taTagUserList.forEach(e -> {
+                tags.add(e.getTagId());
+            });
+            taUser.setTaTags(tags);
+            //获取角色信息
+            QueryWrapper<TaUserRole> taUserRoleQueryWrapper = new QueryWrapper<>();
+            taUserRoleQueryWrapper.eq("user_id",id);
+            List<TaUserRole> taUserRoleList = taUserRoleService.list(taUserRoleQueryWrapper);
+            List<Integer> ids = new ArrayList<>();
+            taUserRoleList.forEach(e -> {
+                ids.add(e.getRoleId());
+            });
+            taUser.setRoleIds(ids);
+            taUser.setLoginPassword("");
+            QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
+            taPersonBuildingQueryWrapper.eq("user_id",taUser.getUserId());
+            TaPersonBuilding taPersonBuilding = taPersonBuildingService.getOne(taPersonBuildingQueryWrapper);
+            if (null != taPersonBuilding){
+                taUser.setBuildingId(taPersonBuilding.getBuildingId());
+            }
+            responseBean.addSuccess(taUser);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        
+        return responseBean;
+    }
+    
+    /**
+     * 保存对象
+     * @param taUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taUser",method= RequestMethod.POST)
+    public ResponseBean adminUserAdd(@RequestBody TaUser taUser,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taUser.setOrgId(getOrgId(request));
+            responseBean.addSuccess(iTaUserService.addAdminUser(taUser));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taUser/{id}",method= RequestMethod.PUT)
+    public ResponseBean adminUserUpdate(@PathVariable Integer id,
+                                     @RequestBody TaUser taUser,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taUser.setUserId(id);
+            taUser.setOrgId(getOrgId(request));
+            responseBean.addSuccess(iTaUserService.updateAdminUser(taUser));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    // 树形菜单
+    @RequestMapping(value="/center/taUser/city/tree",method= RequestMethod.GET)
+    public ResponseBean cityTree(){
+        ResponseBean taUser = iTaUserService.cityTree();
+        return taUser;
+    }
+}

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

@@ -0,0 +1,178 @@
+package com.huiju.estateagents.center.taUser.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.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.entity.TaUserRole;
+import com.huiju.estateagents.center.taUser.service.ITaUserRoleService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+    * 用户角色表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@RestController
+@RequestMapping("/")
+public class TaUserRoleController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaUserRoleController.class);
+
+    @Autowired
+    public ITaUserRoleService iTaUserRoleService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/center/taUserRole",method= RequestMethod.GET)
+    public ResponseBean taUserRoleList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaUserRole> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaUserRole> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaUserRole> result = iTaUserRoleService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserRoleList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taUserRole 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/taUserRole",method= RequestMethod.POST)
+    public ResponseBean taUserRoleAdd(@RequestBody TaUserRole taUserRole){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaUserRoleService.save(taUserRole)){
+                responseBean.addSuccess(taUserRole);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserRoleAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 批量保存用户角色
+     * @param taUserRole 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/taUserRoleList",method= RequestMethod.POST)
+    public ResponseBean taUserRoleListAdd(@RequestBody TaUserRole taUserRole){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            List<TaUserRole> taUserRoleList = new ArrayList<>();
+            List<Integer> roleIdList = taUserRole.getRoleIdList();
+            roleIdList.forEach(e -> {
+                TaUserRole taUserRoles = new TaUserRole();
+                taUserRoles.setRoleId(e);
+                taUserRole.setUserId(taUserRole.getUserId());
+                taUserRoleList.add(taUserRoles);
+            });
+            if (iTaUserRoleService.saveBatch(taUserRoleList)){
+                responseBean.addSuccess(taUserRole);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserRoleAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taUserRole/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taUserRoleDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaUserRoleService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserRoleDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taUserRole 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/taUserRole/{id}",method= RequestMethod.PUT)
+    public ResponseBean taUserRoleUpdate(@PathVariable Integer id,
+                                        @RequestBody TaUserRole taUserRole){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taUserRole.setRoleId(id);
+            if (iTaUserRoleService.updateById(taUserRole)){
+                responseBean.addSuccess(taUserRole);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserRoleUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taUserRole/{id}",method= RequestMethod.GET)
+    public ResponseBean taUserRoleGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaUserRoleService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserRoleDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,40 @@
+package com.huiju.estateagents.center.taUser.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 按钮路由映射表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaButtonUriMap implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 按钮
+     */
+    private String buttonCode;
+
+    /**
+     * uri
+     */
+    private String uri;
+
+    /**
+     * 说明
+     */
+    private String remark;
+
+
+}

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

@@ -0,0 +1,35 @@
+package com.huiju.estateagents.center.taUser.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *  
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaTagUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 人员id
+     */
+    private Integer userId;
+
+    /**
+     * 标签id
+     */
+    private Integer tagId;
+
+
+}

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

@@ -0,0 +1,53 @@
+package com.huiju.estateagents.center.taUser.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;
+
+/**
+ * <p>
+ *  
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaTags implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 标签id
+     */
+    @TableId(value = "tag_id", type = IdType.AUTO)
+    private Integer tagId;
+
+    /**
+     * 标签名称
+     */
+    private String tagName;
+
+    /**
+     * 标签颜色
+     */
+    private String tagColor;
+
+    /**
+     * 标签图表
+     */
+    private String tagIcon;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+
+}

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

@@ -0,0 +1,187 @@
+package com.huiju.estateagents.center.taUser.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.huiju.estateagents.entity.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    @TableId(value = "user_id", type = IdType.AUTO)
+    private Integer userId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 登录账户
+     */
+    private String loginName;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 登录密码
+     */
+    private String loginPassword;
+
+    /**
+     * 用户头像
+     */
+    private String avatar;
+
+    /**
+     * 用户状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 账户过期时间
+     */
+    private LocalDateTime expDate;
+
+    /**
+     * 是否管理员
+     */
+    private Boolean isAdmin;
+
+    /**
+     * 公司名称
+     */
+    private String orgName;
+
+    /**
+     * 部门
+     */
+    private String department;
+
+    /**
+     * 职位
+     */
+    private String position;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 身份证号
+     */
+    private String idNo;
+    
+    private String address;
+    private String photo;
+    private String description;
+    
+    /**
+     * 是否置业顾问
+     */
+    private Boolean isConsultant;
+
+    /**
+     * 公司水印
+     */
+    @TableField(exist = false)
+    private String waterMark;
+
+    /**
+     * 关联小程序
+     */
+    @TableField(exist = false)
+    private TaMiniapp miniapp;
+
+    /**
+     * 授权角色列表
+     */
+    @TableField(exist = false)
+    private List<TaRole> roles;
+
+    /**
+     * 授权菜单列表
+     */
+    @TableField(exist = false)
+    private List<SysMenu> menus;
+
+    /**
+     * 授权按钮列表
+     */
+    @TableField(exist = false)
+    private List<SysButtonInMenu> buttons;
+    
+    @TableField(exist = false)
+    private List<TaTags> taTagsList = new ArrayList<TaTags>();
+    
+    @TableField(exist = false)
+    private List<Integer> taTags = new ArrayList<Integer>();
+    
+    @TableField(exist = false)
+    private List<Integer> roleIds = new ArrayList<Integer>();
+    
+    @TableField(exist = false)
+    private String buildingId;
+
+    @TableField(exist = false)
+    private List<String> projects;
+
+    /**
+     * ta_org/orgNum楼盘最大数
+     */
+  @TableField(exist = false)
+    private int orgNum;
+
+    // 所有省份城市
+    @TableField(exist = false)
+    List<TdCity> tdCityList;
+
+    /**
+     * 前台传值城市
+     */
+    @TableField(exist = false)
+    private ArrayList<Integer> selectCityTree;
+
+    /**
+     * 城市ID
+     */
+    @TableField(exist = false)
+    private Integer cityId;
+}

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

@@ -0,0 +1,51 @@
+package com.huiju.estateagents.center.taUser.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户角色表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaUserRole implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+
+    /**
+     * 角色ID
+     */
+    private Integer roleId;
+    
+    /**
+     * 角色ID集合
+     */
+    @TableField(exist = false)
+    private List<Integer> roleIdList = new ArrayList<>();
+
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.center.taUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.center.taUser.entity.TaButtonUriMap;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 按钮路由映射表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-26
+ */
+@Mapper
+public interface TaButtonUriMapMapper extends BaseMapper<TaButtonUriMap> {
+	
+	TaButtonUriMap getByURI(@Param("uri") String uri);
+}

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

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

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

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

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

@@ -0,0 +1,38 @@
+package com.huiju.estateagents.center.taUser.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.entity.SysButtonInMenu;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author admin
+ * @Title: TaUserAuthButtonMapper
+ * @Description: TODO
+ * @date 2019/9/23
+ */
+@Mapper
+public interface TaUserAuthButtonMapper  extends BaseMapper<SysButtonInMenu> {
+    /**
+     * 根据用户Id查询按钮列表
+     * @param userId
+     * @return
+     */
+    List<SysButtonInMenu> sysButtonListByUserId(@Param("userId")String userId);
+
+
+    /**
+     * 根据角色Id查询按钮列表
+     * @param page
+     * @return
+     */
+    List<SysButtonInMenu> sysButtonListByRoleId();
+
+    void deleteUserAuthButton(@Param("userId") Integer userId);
+
+    void addUserAuthButton(@Param("userId") Integer userId, @Param("sysButtons") List<SysButtonInMenu> sysButtonInMenus);
+}

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

@@ -0,0 +1,46 @@
+package com.huiju.estateagents.center.taUser.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.entity.SysMenu;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+/**
+ * @author weicc
+ * @Title: TaUserAuthMenuMapper
+ * @Description: TODO
+ * @date 2019/9/21
+ */
+@Mapper
+public interface TaUserAuthMenuMapper extends BaseMapper<SysMenu> {
+    /**
+     * 根据用户Id查询菜单列表
+     * @param userId
+     * @return
+     */
+    List<SysMenu> sysMenuListByUserId(@Param("userId")String userId);
+
+
+    /**
+     * 查询菜单列表
+     * @return
+     */
+    List<SysMenu> sysMenuListByRoleId();
+
+    /**
+     * 删除授权的菜单
+     * @param userId
+     */
+    void deleteUserAuthMenu(@Param("userId") Integer userId);
+
+    /**
+     * 新增授权的菜单
+     * @param userId
+     */
+    void addUserAuthMenu(@Param("userId") Integer userId, @Param("sysMenus") List<SysMenu> sysMenuList);
+}

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

@@ -0,0 +1,27 @@
+package com.huiju.estateagents.center.taUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.center.taUser.entity.TaTags;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Mapper
+public interface TaUserMapper extends BaseMapper<TaUser> {
+	
+	List<Map<String,Object>> getPageList(IPage<TaUser> pg);
+	
+	List<TaTags> getTagsList(@Param("userId") Integer userId,@Param("orgId") Integer orgId);
+}

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.center.taUser.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.center.taUser.entity.TaUserRole;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 用户角色表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Mapper
+public interface TaUserRoleMapper extends BaseMapper<TaUserRole> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.center.taUser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.center.taUser.entity.TaButtonUriMap;
+
+/**
+ * <p>
+ * 按钮路由映射表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-26
+ */
+public interface ITaButtonUriMapService extends IService<TaButtonUriMap> {
+	
+	TaButtonUriMap getByURI(String uri);
+}

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.center.taUser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.center.taUser.entity.TaTagUser;
+
+/**
+ * <p>
+ *   服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+public interface ITaTagUserService extends IService<TaTagUser> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.center.taUser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.center.taUser.entity.TaTags;
+
+/**
+ * <p>
+ *   服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+public interface ITaTagsService extends IService<TaTags> {
+
+}

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

@@ -0,0 +1,22 @@
+package com.huiju.estateagents.center.taUser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+
+import java.util.List;
+
+/**
+ * @author admin
+ * @Title: ITaUserAuthButtonService
+ * @Description: TODO
+ * @date 2019/9/23
+ */
+public interface ITaUserAuthButtonService extends IService<SysButtonInMenu> {
+
+    ResponseBean getButtonByUserId(Integer pageNum, Integer pageSize, String userId);
+
+    ResponseBean getAllButton(Integer pageNum, Integer pageSize);
+
+    ResponseBean updateUserAuthButton(Integer userId, List<SysButtonInMenu> sysButtonInMenus);
+}

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

@@ -0,0 +1,23 @@
+package com.huiju.estateagents.center.taUser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+import com.huiju.estateagents.entity.SysMenu;
+
+import java.util.List;
+
+/**
+ * @author admin
+ * @Title: ITaUserAuthMenuService
+ * @Description: TODO
+ * @date 2019/9/21
+ */
+public interface ITaUserAuthMenuService extends IService<SysMenu> {
+
+    ResponseBean getMenuByUserId(Integer pageNum, Integer pageSize, String userId);
+
+    ResponseBean getAllMenu(Integer pageNum, Integer pageSize);
+
+    ResponseBean updateUserAuthMenu(Integer userId, List<SysMenu> sysMenuList,String name,Integer orgid,List<SysButtonInMenu> sysButtonInMenuList);
+}

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.center.taUser.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.center.taUser.entity.TaUserRole;
+
+/**
+ * <p>
+ * 用户角色表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+public interface ITaUserRoleService extends IService<TaUserRole> {
+
+}

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

@@ -0,0 +1,45 @@
+package com.huiju.estateagents.center.taUser.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaTags;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+public interface ITaUserService extends IService<TaUser> {
+	
+	IPage<Map<String,Object>> getPageList(IPage<TaUser> pg);
+
+    TaUser newUserAndOrg(TaUser taUser) throws Exception;
+
+    TaUser getInfoWithOrg(Integer id);
+
+    void updateInfoWithOrg(TaUser taUser) throws Exception;
+
+    void turnUserOnOrNot(Integer id, boolean isOn) throws Exception;
+
+    void resetPassword(Integer id, String newPass) throws Exception;
+    
+    List<TaTags> getTagsList(TaUser e);
+    
+    TaUser addAdminUser(TaUser taUser) throws Exception;
+    
+    TaUser updateAdminUser(TaUser taUser) throws Exception;
+
+    /**
+     * 查询所有城市
+     * @return
+     */
+    ResponseBean cityTree();
+}

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

@@ -0,0 +1,28 @@
+package com.huiju.estateagents.center.taUser.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.taUser.entity.TaButtonUriMap;
+import com.huiju.estateagents.center.taUser.mapper.TaButtonUriMapMapper;
+import com.huiju.estateagents.center.taUser.service.ITaButtonUriMapService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 按钮路由映射表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-26
+ */
+@Service
+public class TaButtonUriMapServiceImpl extends ServiceImpl<TaButtonUriMapMapper, TaButtonUriMap> implements ITaButtonUriMapService {
+	
+	@Autowired
+	private TaButtonUriMapMapper taButtonUriMapMapper;
+	
+	@Override
+	public TaButtonUriMap getByURI(String uri) {
+		return taButtonUriMapMapper.getByURI(uri);
+	}
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.center.taUser.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.taUser.entity.TaTagUser;
+import com.huiju.estateagents.center.taUser.mapper.TaTagUserMapper;
+import com.huiju.estateagents.center.taUser.service.ITaTagUserService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *   服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+@Service
+public class TaTagUserServiceImpl extends ServiceImpl<TaTagUserMapper, TaTagUser> implements ITaTagUserService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.center.taUser.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.taUser.entity.TaTags;
+import com.huiju.estateagents.center.taUser.mapper.TaTagsMapper;
+import com.huiju.estateagents.center.taUser.service.ITaTagsService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *   服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-24
+ */
+@Service
+public class TaTagsServiceImpl extends ServiceImpl<TaTagsMapper, TaTags> implements ITaTagsService {
+
+}

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

@@ -0,0 +1,84 @@
+package com.huiju.estateagents.center.taUser.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.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.mapper.TaUserAuthButtonMapper;
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.center.taUser.service.ITaUserAuthButtonService;
+import com.huiju.estateagents.entity.SysButtonInMenu;
+import com.huiju.estateagents.entity.SysMenu;
+import com.huiju.estateagents.entity.TaRole;
+import com.huiju.estateagents.entity.TaRoleButton;
+import com.huiju.estateagents.mapper.TaRoleButtonMapper;
+import com.huiju.estateagents.mapper.TaRoleMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author admin
+ * @Title: TaUserAuthButtonServiceImpl
+ * @Description: TODO
+ * @date 2019/9/23
+ */
+@Service
+public class TaUserAuthButtonServiceImpl extends ServiceImpl<TaUserAuthButtonMapper, SysButtonInMenu> implements ITaUserAuthButtonService {
+
+    @Autowired
+    TaUserAuthButtonMapper taUserAuthButtonMapper;
+    @Autowired
+    TaRoleButtonMapper taRoleButtonMapper;
+    @Autowired
+    private TaUserMapper taUserMapper;
+    @Autowired
+    private TaRoleMapper taRoleMapper;
+
+    @Override
+    public ResponseBean getButtonByUserId(Integer pageNum, Integer pageSize, String userId) {
+        List<SysButtonInMenu> records = taUserAuthButtonMapper.sysButtonListByUserId(userId);
+        return ResponseBean.success(records);
+    }
+
+    @Override
+    public ResponseBean getAllButton(Integer pageNum, Integer pageSize) {
+        List<SysButtonInMenu> records = taUserAuthButtonMapper.sysButtonListByRoleId();
+        records.forEach(e -> {
+            List<TaRole> taRoles = taRoleMapper.getRolesByBtnId(e.getBtnId());
+            e.setRolesList(taRoles);
+        });
+
+        return ResponseBean.success(records);
+    }
+
+    @Override
+    public ResponseBean updateUserAuthButton(Integer userId, List<SysButtonInMenu> sysButtonInMenus) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 人员
+        TaUser taUser = taUserMapper.selectById(userId);
+        if (null == taUser) {
+            responseBean.addError("授权人不存在");
+            return responseBean;
+        }
+
+
+        try{
+            //授权菜单按钮，先删除在新增
+            taUserAuthButtonMapper.deleteUserAuthButton(userId);
+            taUserAuthButtonMapper.addUserAuthButton(userId, sysButtonInMenus);
+            responseBean.addSuccess("操作成功");
+            return  responseBean;
+        }catch (Exception e){
+            responseBean.addSuccess("操作失败");
+            e.printStackTrace();
+            return responseBean;
+        }
+
+    }
+}

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

@@ -0,0 +1,155 @@
+package com.huiju.estateagents.center.taUser.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.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.mapper.TaUserAuthMenuMapper;
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.TaRoleButtonMapper;
+import com.huiju.estateagents.mapper.TaRoleMapper;
+import com.huiju.estateagents.mapper.TaRoleMenuMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author weicc
+ * @Title: TaUserAuthMenuServiceImpl
+ * @Description: TODO
+ * @date 2019/9/21
+ */
+@Service
+public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper, SysMenu> implements ITaUserAuthMenuService {
+
+
+    @Autowired
+    private TaUserAuthMenuMapper taUserAuthMenuMapper;
+    @Autowired
+    private TaRoleMenuMapper taRoleMenuMapper;
+    @Autowired
+    private TaUserMapper taUserMapper;
+
+    @Autowired
+    private  TaRoleMapper taRoleMapper;
+
+    @Autowired
+    private TaRoleButtonMapper taRoleButtonMapper;
+
+    /**
+     * 根据用户id获取授权菜单
+     * @param pageNum
+     * @param pageSize
+     * @param userId
+     * @return
+     */
+    @Override
+    public ResponseBean getMenuByUserId(Integer pageNum, Integer pageSize, String userId) {
+
+        List<SysMenu> records = taUserAuthMenuMapper.sysMenuListByUserId(userId);
+        return ResponseBean.success(records);
+    }
+
+    @Override
+    public ResponseBean getAllMenu(Integer pageNum, Integer pageSize) {
+
+        List<SysMenu> records = taUserAuthMenuMapper.sysMenuListByRoleId();
+
+        QueryWrapper<TaRoleMenu> queryWrapper = new QueryWrapper();
+        List<TaRoleMenu> taRoleMenus = taRoleMenuMapper.selectList(queryWrapper);
+
+        for (SysMenu sysMenu : records){
+            ArrayList<Integer> roles = new ArrayList<>();
+            for (TaRoleMenu taRoleMenu : taRoleMenus){
+                if (taRoleMenu.getMenuId().equals(sysMenu.getMenuId()) && !roles.contains(taRoleMenu.getRoleId())){
+                    roles.add(taRoleMenu.getRoleId());
+                }
+            }
+            sysMenu.setRoles(roles);
+        }
+
+        return ResponseBean.success(records);
+    }
+
+    @Override
+    public ResponseBean updateUserAuthMenu(Integer roleId, List<SysMenu> sysMenuList,String name,Integer orgId,List<SysButtonInMenu> sysButtonInMenuList) {
+        ResponseBean responseBean = new ResponseBean();
+        if (null == roleId){
+            addUserAuthMenu( sysMenuList,name,orgId,sysButtonInMenuList);
+            return responseBean;
+        }
+        try {
+            //授权菜单，先删除在新增
+            taRoleMenuMapper.deleteCurrentMenu(roleId);
+            for (SysMenu sysMenu: sysMenuList) {
+                TaRoleMenu taRoleMenu = new TaRoleMenu();
+                taRoleMenu.setRoleId(roleId);
+                taRoleMenu.setMenuId(sysMenu.getMenuId());
+                taRoleMenuMapper.insert(taRoleMenu);
+            }
+            // 更新Role
+            TaRole taRole = new TaRole();
+            taRole.setRoleId(roleId);
+            taRole.setRoleName(name);
+            taRoleMapper.updateById(taRole);
+
+            // 当前角色的所有按钮再重新插入
+
+            taRoleButtonMapper.deleteCurrentBut(roleId);
+            for (SysButtonInMenu sysButtonInMenu :sysButtonInMenuList) {
+                TaRoleButton taRoleButton = new TaRoleButton();
+                taRoleButton.setRoleId(taRole.getRoleId());
+                taRoleButton.setBtnId(sysButtonInMenu.getBtnId());
+                taRoleButtonMapper.insert(taRoleButton);
+            }
+                responseBean.addSuccess("操作成功");
+            return responseBean;
+        } catch (Exception e) {
+            responseBean.addSuccess("操作失败");
+            e.printStackTrace();
+            return responseBean;
+        }
+    }
+
+    public Boolean addUserAuthMenu(List<SysMenu> sysMenuList,String name,Integer orgId,List<SysButtonInMenu> sysButtonInMenuList) {
+        ResponseBean responseBean = new ResponseBean();
+        try{
+            // 新增角色
+            TaRole taRole = new TaRole();
+            taRole.setRoleName(name);
+            taRole.setOrgId(orgId);
+            taRole.setStatus(1);
+            taRole.setCreateDate(LocalDateTime.now());
+            taRoleMapper.insert(taRole);
+
+            // 新增角色需要的菜单
+          for (SysMenu sysMenu: sysMenuList){
+              TaRoleMenu taRoleMenu = new TaRoleMenu();
+              taRoleMenu.setRoleId(taRole.getRoleId());
+              taRoleMenu.setMenuId(sysMenu.getMenuId());
+              taRoleMenuMapper.insert(taRoleMenu);
+          }
+          // 新增角色按钮
+          for (SysButtonInMenu sysButtonInMenu :sysButtonInMenuList){
+              TaRoleButton  taRoleButton = new TaRoleButton();
+              taRoleButton.setRoleId(taRole.getRoleId());
+              taRoleButton.setBtnId(sysButtonInMenu.getBtnId());
+              taRoleButtonMapper.insert(taRoleButton);
+          }
+            responseBean.addSuccess("操作成功");
+            return  true;
+        }catch (Exception e){
+            responseBean.addSuccess("操作失败");
+            e.printStackTrace();
+            return false;
+        }
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.center.taUser.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.taUser.entity.TaUserRole;
+import com.huiju.estateagents.center.taUser.mapper.TaUserRoleMapper;
+import com.huiju.estateagents.center.taUser.service.ITaUserRoleService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户角色表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Service
+public class TaUserRoleServiceImpl extends ServiceImpl<TaUserRoleMapper, TaUserRole> implements ITaUserRoleService {
+
+}

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

@@ -0,0 +1,431 @@
+package com.huiju.estateagents.center.taUser.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.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaTagUser;
+import com.huiju.estateagents.center.taUser.entity.TaTags;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.entity.TaUserRole;
+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.common.CommConstant;
+import com.huiju.estateagents.common.MD5Utils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.*;
+import com.huiju.estateagents.service.ITaBuildingReportService;
+import com.huiju.estateagents.service.ITdReportService;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 用户表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Service
+public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> implements ITaUserService {
+	
+	@Autowired
+	private TaUserMapper taUserMapper;
+
+	@Autowired
+	private TaOrgMapper taOrgMapper;
+
+	@Autowired
+	private TaMiniappMapper taMiniappMapper;
+
+	@Autowired
+	private TaMiniappTemplateMapper taMiniappTemplateMapper;
+	
+	@Autowired
+	private TaTagUserMapper taTagUserMapper;
+	
+	@Autowired
+	private TaPersonBuildingMapper taPersonBuildingMapper;
+	
+	@Autowired
+	private TaPersonMapper taPersonMapper;
+	
+	@Autowired
+	private TaUserRoleMapper taUserRoleMapper;
+
+	@Autowired
+	private TdPointsRulesMapper tdPointsRulesMapper;
+
+	@Autowired
+	private ITdReportService iTdReportService;
+
+	@Autowired
+	private ITaBuildingReportService iTaBuildingReportService;
+
+	@Autowired
+    private  TdCityMapper tdCityMapper;
+
+	@Autowired
+	private  TaOrgCityMapper taOrgCityMapper;
+	
+	@Override
+	public IPage<Map<String,Object>> getPageList(IPage pg) {
+		List<Map<String,Object>> taUserList = taUserMapper.getPageList(pg);
+		pg.setRecords(taUserList);
+		return pg;
+	}
+
+	@Override
+	public TaUser newUserAndOrg(TaUser taUser) throws Exception {
+		if (StringUtils.isEmpty(taUser.getPhone())) {
+			throw new Exception("电话号码不能为空");
+		}
+		if (StringUtils.isEmpty(taUser.getUserName())) {
+			throw new Exception("用户名称不能为空");
+		}
+
+		if (StringUtils.isEmpty(taUser.getLoginName())) {
+			taUser.setLoginName(taUser.getPhone());
+		}
+
+		QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
+		wrapper.eq("phone", taUser.getPhone()).or().eq("login_Name", taUser.getLoginName());
+		List<TaUser> taUserList = this.list(wrapper);
+		if (null != taUserList && taUserList.size() > 0) {
+			throw new Exception("电话号码或登录名重复");
+		}
+
+		// 先插入 org
+		TaOrg taOrg = new TaOrg();
+		taOrg.setName(taUser.getOrgName());
+		taOrg.setWaterMark(taUser.getWaterMark());
+		taOrg.setCreateDate(LocalDateTime.now());
+		taOrg.setBuildingNum(taUser.getOrgNum());
+		taOrg.setDefaultCityId(taUser.getCityId());
+		if (taOrgMapper.insert(taOrg) < 1) {
+			throw new Exception("生成用户公司信息失败");
+		}
+
+		// 维护当前城市所在城市
+		addAndupdate(taUser.getSelectCityTree(),false,taOrg.getOrgId());
+
+		// 插入积分, 默认全部 1 积分
+		List<TdPointsRules> pointsRules = tdPointsRulesMapper.getTPLRules();
+		if (pointsRules != null) {
+			for (int i = 0; i < pointsRules.size(); i ++) {
+				TdPointsRules rule = pointsRules.get(i);
+				rule.setOrgId(taOrg.getOrgId());
+				rule.setStatus(CommConstant.STATUS_NORMAL);
+				rule.setPointsAmount(1);	// 默认1积分
+				tdPointsRulesMapper.insert(rule);
+			}
+		}
+
+		// 插入统计，默认全部显示
+		QueryWrapper<TdReport> queryWrapper = new QueryWrapper<>();
+		queryWrapper.orderByDesc("create_date");
+		queryWrapper.eq("status", 1);
+		List<TdReport> tdReportList = iTdReportService.list(queryWrapper);
+		if (CollectionUtils.isNotEmpty(tdReportList)) {
+			List<TaBuildingReport> buildingReportList = tdReportList.stream().map(e -> {
+				TaBuildingReport taBuildingReport = new TaBuildingReport();
+				taBuildingReport.setOrgId(taOrg.getOrgId());
+				taBuildingReport.setReportCode(e.getReportCode());
+				taBuildingReport.setCreateDate(LocalDateTime.now());
+
+				return taBuildingReport;
+			}).collect(Collectors.toList());
+
+			iTaBuildingReportService.saveBatch(buildingReportList);
+		}
+
+		taUser.setOrgId(taOrg.getOrgId());
+		taUser.setIsAdmin(true);
+		taUser.setLoginPassword(MD5Utils.md5(taUser.getLoginPassword()));
+		taUser.setStatus(CommConstant.STATUS_NORMAL);
+		taUser.setCreateDate(LocalDateTime.now());
+		if (!this.save(taUser)) {
+			throw new Exception("生成用户信息失败");
+		}
+
+		return taUser;
+	}
+
+	// 维护公司所在城市
+	public void addAndupdate(ArrayList<Integer> selectCityTree,boolean isA,Integer orgid){
+
+			QueryWrapper<TdCity> tdCityQuery= new QueryWrapper<>();
+			tdCityQuery.eq("leveltype",1);
+			 List<TdCity> tdCityList= tdCityMapper.selectList(tdCityQuery);
+
+		// isA=true删除所有城市重新添加
+		if (isA == true){
+			for(Integer city:selectCityTree) {
+				taOrgCityMapper.deleteById(city);
+			}
+		}
+			 // 对比现在的城市ID
+			 for(Integer city:selectCityTree){
+				for (TdCity tdCity : tdCityList){
+					if (city.equals(tdCity.getId())){
+						TaOrgCity  taOrgCity = new TaOrgCity();
+						taOrgCity.setId(city).setName(tdCity.getName()).setOrgId(orgid).setStatus(1).setParentid(tdCity.getParentid());
+					}
+
+				}
+			 }
+
+	}
+
+	@Override
+	public TaUser getInfoWithOrg(Integer id) {
+		TaUser taUser = this.getById(id);
+		if (null == taUser) {
+			return taUser;
+		}
+
+		TaOrg taOrg = taOrgMapper.selectById(taUser.getOrgId());
+		if (null != taOrg) {
+			taUser.setOrgName(taOrg.getName());
+			taUser.setWaterMark(taOrg.getWaterMark());
+			taUser.setOrgNum(taOrg.getBuildingNum());
+			taOrg.setDefaultCityId(taUser.getCityId());
+		}
+
+		QueryWrapper<TaMiniapp> wrapper = new QueryWrapper<>();
+		wrapper.eq("org_id", taOrg.getOrgId());
+
+		TaMiniapp taMiniapp = taMiniappMapper.selectOne(wrapper);
+		if (null != taMiniapp) {
+			QueryWrapper<TaMiniappTemplate> query = new QueryWrapper<>();
+			query.eq("miniapp_id", taMiniapp.getMiniappId());
+			taMiniapp.setTpls(taMiniappTemplateMapper.selectList(query));
+		}
+
+		taUser.setMiniapp(taMiniapp);
+		taUser.setLoginPassword(null);
+		return taUser;
+	}
+
+	@Override
+	public void updateInfoWithOrg(TaUser taUser) throws Exception {
+		TaOrg taOrg = taOrgMapper.selectById(taUser.getOrgId());
+		if (null != taOrg) {
+			taOrg.setName(taUser.getOrgName());
+			taOrg.setWaterMark(taUser.getWaterMark());
+			taOrg.setBuildingNum(taUser.getOrgNum());
+
+			if (taOrgMapper.updateById(taOrg) < 1) {
+				throw new Exception("更新用户公司信息失败");
+			}
+
+			addAndupdate(taUser.getSelectCityTree(),true,taOrg.getOrgId());
+		}
+		
+		taUser.setLoginPassword(null);
+		if (taUserMapper.updateById(taUser) < 1) {
+			throw new Exception("更新用户信息失败");
+		}
+	}
+
+	@Override
+	public void turnUserOnOrNot(Integer id, boolean isOn) throws Exception {
+		TaUser taUser = this.getById(id);
+		if (null == taUser) {
+			throw new Exception("未找到有效的用户信息");
+		}
+
+		Integer status = isOn ? CommConstant.STATUS_NORMAL : CommConstant.STATUS_CLOSED;
+		TaUser user = new TaUser();
+		user.setStatus(status);
+		user.setUserId(id);
+
+		if (!this.updateById(user)) {
+			throw new Exception("开启或禁用用户失败");
+		}
+	}
+
+	@Override
+	public void resetPassword(Integer id, String newPass) throws Exception {
+		TaUser taUser = this.getById(id);
+		if (null == taUser) {
+			throw new Exception("未找到有效的用户信息");
+		}
+
+		String encryptPass = MD5Utils.md5(MD5Utils.md5(newPass));
+		TaUser user = new TaUser();
+		user.setLoginPassword(encryptPass);
+		user.setUserId(id);
+
+		if (!this.updateById(user)) {
+			throw new Exception("重置用户密码失败");
+		}
+	}
+	
+	@Override
+	public List<TaTags> getTagsList(TaUser e) {
+		return taUserMapper.getTagsList(e.getUserId(),e.getOrgId());
+	}
+	
+	@Override
+	public TaUser  addAdminUser(TaUser taUser) throws Exception {
+		if (StringUtils.isEmpty(taUser.getPhone())) {
+			throw new Exception("电话号码不能为空");
+		}
+		if (StringUtils.isEmpty(taUser.getUserName())) {
+			throw new Exception("用户名称不能为空");
+		}
+		
+		if (StringUtils.isEmpty(taUser.getLoginName())) {
+			taUser.setLoginName(taUser.getPhone());
+		}
+		
+		QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
+		wrapper.eq("phone", taUser.getPhone()).or().eq("login_Name", taUser.getLoginName());
+		wrapper.eq("org_id",taUser.getOrgId());
+		List<TaUser> taUserList = this.list(wrapper);
+		if (null != taUserList && taUserList.size() > 0) {
+			throw new Exception("电话号码或登录名重复");
+		}
+		taUser.setLoginPassword(MD5Utils.md5(MD5Utils.md5("123456")));
+		taUser.setStatus(CommConstant.STATUS_NORMAL);
+		taUser.setCreateDate(LocalDateTime.now());
+		if (taUserMapper.insert(taUser) < 1) {
+			throw new Exception("生成用户信息失败");
+		}
+		
+		//保存标签
+		List<Integer> tags = taUser.getTaTags();
+		tags.forEach(e -> {
+			TaTagUser taTagUser = new TaTagUser();
+			taTagUser.setUserId(taUser.getUserId());
+			taTagUser.setTagId(e);
+			taTagUserMapper.insert(taTagUser);
+		});
+		
+		//保存用户角色
+		List<Integer> roleIds = taUser.getRoleIds();
+		roleIds.forEach(e -> {
+			TaUserRole taUserRole = new TaUserRole();
+			taUserRole.setUserId(taUser.getUserId());
+			taUserRole.setRoleId(e);
+			taUserRoleMapper.insert(taUserRole);
+		});
+		
+		//保存项目
+		TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+		taPersonBuilding.setBuildingId(taUser.getBuildingId());
+		taPersonBuilding.setUserId(taUser.getUserId());
+		taPersonBuilding.setCreateDate(LocalDateTime.now());
+		taPersonBuildingMapper.insert(taPersonBuilding);
+		return taUser;
+	}
+	
+	@Override
+	public TaUser updateAdminUser(TaUser taUser) throws Exception {
+		TaUser taUserBefore = taUserMapper.selectById(taUser.getUserId());
+		if (StringUtils.isEmpty(taUser.getPhone())) {
+			throw new Exception("电话号码不能为空");
+		}
+		if (StringUtils.isEmpty(taUser.getUserName())) {
+			throw new Exception("用户名称不能为空");
+		}
+		if(StringUtils.isEmpty(taUser.getLoginName()) && taUserBefore.getLoginName().equals(taUserBefore.getPhone())){
+			taUser.setLoginName(taUser.getPhone());
+		}
+
+		QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
+		wrapper.nested(q -> q.eq("phone", taUser.getPhone()).or().eq("login_Name", taUser.getLoginName()));
+		wrapper.eq("org_id",taUser.getOrgId());
+		wrapper.ne("user_id",taUser.getUserId());
+		List<TaUser> taUserList = this.list(wrapper);
+		if (null != taUserList && taUserList.size() > 0) {
+			throw new Exception("电话号码或登录名重复");
+		}
+		if (taUserMapper.updateById(taUser) < 1){
+			throw new Exception("更新用户信息失败");
+		}
+		QueryWrapper<TaTagUser> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("user_id",taUser.getUserId());
+		taTagUserMapper.delete(queryWrapper);
+		//保存标签
+		List<Integer> tags = taUser.getTaTags();
+		tags.forEach(e -> {
+			TaTagUser taTagUser = new TaTagUser();
+			taTagUser.setUserId(taUser.getUserId());
+			taTagUser.setTagId(e);
+			taTagUserMapper.insert(taTagUser);
+		});
+		
+		QueryWrapper<TaUserRole> taUserRoleQueryWrapper = new QueryWrapper<>();
+		taUserRoleQueryWrapper.eq("user_id",taUser.getUserId());
+		taUserRoleMapper.delete(taUserRoleQueryWrapper);
+		//保存用户角色
+		List<Integer> roleIds = taUser.getRoleIds();
+		roleIds.forEach(e -> {
+			TaUserRole taUserRole = new TaUserRole();
+			taUserRole.setUserId(taUser.getUserId());
+			taUserRole.setRoleId(e);
+			taUserRoleMapper.insert(taUserRole);
+		});
+		
+		QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
+		taPersonBuildingQueryWrapper.eq("user_id",taUser.getUserId());
+		taPersonBuildingMapper.delete(taPersonBuildingQueryWrapper);
+		//保存项目
+		TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+		taPersonBuilding.setBuildingId(taUser.getBuildingId());
+		taPersonBuilding.setUserId(taUser.getUserId());
+		taPersonBuilding.setCreateDate(LocalDateTime.now());
+		taPersonBuildingMapper.insert(taPersonBuilding);
+		
+		//更新person
+		TaPerson taPerson = new TaPerson();
+		taPerson.setAvatarurl(taUser.getAvatar());
+		taPerson.setCompany(taUser.getOrgName());
+		taPerson.setTel(taUser.getPhone());
+		taPerson.setName(taUser.getUserName());
+		taPerson.setAddress(taUser.getAddress());
+		taPerson.setIdNo(taUser.getIdNo());
+		taPerson.setDepartment(taUser.getDepartment());
+		taPerson.setPost(taUser.getPosition());
+		taPerson.setPhoto(taUser.getPhoto());
+		QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+		taPersonQueryWrapper.eq("user_id",taUser.getUserId());
+		taPersonMapper.update(taPerson,taPersonQueryWrapper);
+		
+		return taUser;
+	}
+
+    @Override
+    public ResponseBean cityTree() {
+	   ResponseBean responseBean = new ResponseBean<>();
+	    // 省份
+        TaUser taUser = new TaUser();
+	    QueryWrapper<TdCity> tdCityQueryWrapper= new  QueryWrapper<>();
+        tdCityQueryWrapper.eq("leveltype",1);
+        List<TdCity> tdCityList= tdCityMapper.selectList(tdCityQueryWrapper);
+        taUser.setTdCityList(tdCityList);
+        for (TdCity tdCity: tdCityList){
+            // 根据parentid查询城市
+            QueryWrapper<TdCity> tdCityQuery= new  QueryWrapper<>();
+            tdCityQuery.eq("parentid",tdCity.getId());
+            List<TdCity> city= tdCityMapper.selectList(tdCityQuery);
+            tdCity.setChildren(city);
+        }
+        responseBean.addSuccess(taUser);
+        return responseBean;
+    }
+}

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

@@ -18,6 +18,21 @@ public class CommConstant {
      */
     public final static String PERSON_ESTATE_AGENT = "estate agent";
 
+    /**
+     * 人员类型: 客户
+     */
+    public final static String PERSON_ESTATE_CUSTOMER = "customer";
+
+    /**
+     * 人员类型: 渠道经纪人
+     */
+    public final static String PERSON_ESTATE_CHANNEL = "channel agent";
+
+    /**
+     * 人员类型: 游客
+     */
+    public final static String PERSON_ESTATE_DRIFT = "drift";
+
     /**
      * 状态: 正常
      */
@@ -28,6 +43,11 @@ public class CommConstant {
      */
     public final static int STATUS_DELETE = -1;
 
+    /**
+     * 状态: 关闭、禁用
+     */
+    public final static int STATUS_CLOSED = 9;
+
     /**
      * 消息未读
      */
@@ -75,15 +95,35 @@ public class CommConstant {
     public final static String POINTS_CHANGE_SHARE_POSTER = "share-poster";
     
     /**
-     * 注册经纪人
+     * 授权手机号
      */
     public final static String POINTS_CHANGE_SIGNUP_AGENT = "signup-agent";
+    
+    /**
+     * 拼团
+     */
+    public final static String POINTS_CHANGE_GROUP = "group";
 
     /**
      * 推荐客户
      */
     public final static String POINTS_CHANGE_RECOMMEND_CUSTOMER = "recommend-customer";
 
+    /**
+     * 活动核销
+     */
+    public final static String POINTS_CHANGE_ACTIVITY_VERIFICATION = "activity_verification";
+
+    /**
+     * 资料审核
+     */
+    public final static String POINTS_CHANGE_DOCUMENT_VERIFY = "document_verify";
+
+    /**
+     * 资料审核
+     */
+    public final static String POINTS_CHANGE_ACTIVITY_CHECKIN = "activity_checkin";
+
 
     /**
      * 小程序默认首页
@@ -167,22 +207,22 @@ public class CommConstant {
     /**
      * 客户报备
      */
-    public static final String CUSTOMER_REPORT = "1";
+    public static final Integer CUSTOMER_REPORT = 1;
 
     /**
      * 客户到访
      */
-    public static final String CUSTOMER_VISITE = "2";
+    public static final Integer CUSTOMER_VISITE = 2;
 
     /**
      * 客户认购
      */
-    public static final String CUSTOMER_PREORDER = "3";
+    public static final Integer CUSTOMER_PREORDER = 3 ;
 
     /**
      * 客户签约
      */
-    public static final String CUSTOMER_SIGNED = "4";
+    public static final Integer CUSTOMER_SIGNED = 4;
 
 
     /**
@@ -245,6 +285,21 @@ public class CommConstant {
      */
     public static final Integer POINTS_RULE_SIGNUP_AGENT = 4;
 
+    /**
+     * 活动核销送积分规则
+     */
+    public static final Integer POINTS_RULE_ACTIVITY_VERIFICATION = 6;
+
+    /**
+     * 资料审核送积分规则
+     */
+    public static final Integer POINTS_RULE_DOCUMENT_VERIFY = 7;
+
+    /**
+     * 普通活动签到送积分规则
+     */
+    public static final Integer POINTS_RULE_ACTIVITY_CHECKIN = 8;
+
     /**
      * 平台积分
      */
@@ -320,6 +375,7 @@ public class CommConstant {
     // ------- 性别 start -------
     public static final Integer SEX_MALE = 1;
     public static final Integer SEX_FEMALE = 2;
+    public static final Integer SEX_UNKNOWN = 3;
     // ------- 性别 end -------
 
     // ------- 推荐客户状态 start -------
@@ -348,4 +404,95 @@ public class CommConstant {
     public static final Integer NOT_PUBLISH = 0;
     // ------- 政策发布状态 end -------
 
+    // 公客
+    public static final String CUTOMER_TYPE_PUBLIC = "public";
+    // 私客
+    public static final String CUTOMER_TYPE_PRIVATE = "private";
+
+
+    //项目
+    public static final String POSTER_CONTENT_TYPE_BUILDING = "building";
+    //活动
+    public static final String POSTER_CONTENT_TYPE_ACTIVITY = "activity";
+    //资讯
+    public static final String POSTER_CONTENT_TYPE_NEWS = "news";
+    //人员
+    public static final String POSTER_CONTENT_TYPE_PERSON = "person";
+	
+	
+	public static final String GD_KEY = "c9fc664a9030aed2ec2183508c2ca476";
+ 
+	//已参与微信端用
+    public static final Integer ACTIVITY_STATUS_PARTNER = 3;
+    
+    //发起者
+	public static final String HELP_STATUS_INITIATE = "Initiate";
+	
+	//助力活动
+	public static final Object HELP_ACTIVITY = "helpActivity";
+	
+	//分享活动
+	public static final Object GROUP_ACTIVITY = "groupActivity";
+	public static final String TARGET_TYPE_H5 = "H5";
+    public static final String ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/checkin/index\"}";
+    
+    /**
+     * 消息通知
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MINIAPP_TPL_NOTICE = "notice";
+    
+    /**
+     * 助力通知
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MINIAPP_TPL_HELP = "help-result";
+    
+    /**
+     * 拼团通知
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MINIAPP_TPL_GROUP = "group-result";
+    
+    /**
+     * 活动以结束
+     */
+    public static final Integer ACTIVITY_STATUS_FINISH = 2;
+    
+    /**
+     * 客户统计类型：跟进客户
+     */
+	public static final String CUSTOMER_TYPE_FOLLOW = "follow";
+    
+    /**
+     * 客户统计类型：新增客户
+     */
+    public static final String CUSTOMER_TYPE_NEW = "new";
+    
+    /**
+     * 客户统计类型：到访客户
+     */
+    public static final String CUSTOMER_TYPE_VISITE = "visite";
+
+    // =================   项目图片类型 ==============
+
+    /**
+     * 项目banner
+     */
+    public static final String BUILDING_IMG_BANNER = "banner";
+
+    /**
+     * 项目列表图
+     */
+    public static final String BUILDING_IMG_LIST = "list";
+
+    /**
+     * 视频封面图
+     */
+    public static final String BUILDING_IMG_VIDEOIMAGE = "videoImage";
+
+    /**
+     * 户型图
+     */
+    public static final String BUILDING_IMG_APARMENT = "aparment";
 }

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

@@ -32,4 +32,9 @@ public class DateUtils {
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         return LocalDateTime.parse(day + " 00:00:00",df);
     }
+
+    public static LocalDateTime dayToLocalDateime(String day) {
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        return LocalDateTime.parse(day,df);
+    }
 }

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

@@ -1,13 +1,13 @@
 package com.huiju.estateagents.common;
 
 import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
 import io.jsonwebtoken.security.Keys;
 
 import javax.servlet.http.HttpServletRequest;
 import java.security.Key;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.Map;
 
 /**
  * JWTUtils
@@ -17,7 +17,7 @@ import java.util.Date;
 public class JWTUtils {
     // 直接定义常量是不安全的
     public final static Key key = Keys.hmacShaKeyFor("yansenisahero,2019-5-17 16:18:14".getBytes());
-
+    
     /**
      * getSubject 获取 jwt subject
      * @param request
@@ -38,6 +38,47 @@ public class JWTUtils {
 
         return null;
     }
+    
+    /**
+     * getSubject 获取 jwt subject
+     * @param request
+     * @return
+     */
+    public static Map getUserIdAndOrgId(HttpServletRequest request) {
+        String jwtHeader = request.getHeader("authorization");
+        if (null == jwtHeader || "".equals(jwtHeader.trim())) return null;
+        
+        String[] jwtAuths = jwtHeader.split("Bearer ");
+        if (null == jwtAuths || jwtAuths.length < 2) return null;
+        
+        try {
+            return Jwts.parser().setSigningKey(key).parseClaimsJws(jwtAuths[1]).getBody();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        
+        return null;
+    }
+    
+    /**
+     * getSubject 获取 jwt subject
+     * @param request
+     * @return
+     */
+    public static String getToken(HttpServletRequest request) {
+        String jwtHeader = request.getHeader("authorization");
+        if (null == jwtHeader || "".equals(jwtHeader.trim())) {
+            return null;
+        }
+        
+        String[] jwtAuths = jwtHeader.split("Bearer ");
+        if (null == jwtAuths || jwtAuths.length < 2) {
+            return null;
+        }
+        
+        
+        return jwtAuths[1];
+    }
 
     /**
      * newToken 生成新的 token
@@ -49,7 +90,20 @@ public class JWTUtils {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(new Date());
         calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)+7);
-
         return Jwts.builder().setSubject(subject).setExpiration(calendar.getTime()).signWith(key).compact();
     }
+    
+    /**
+     * newToken 生成新的 token
+     * @param subject
+     * @return
+     */
+    public static String newTokenByMap(Map subject) {
+        // 有效期 7 天
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)+7);
+
+        return Jwts.builder().setClaims(subject).setExpiration(calendar.getTime()).signWith(key).compact();
+    }
 }

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

@@ -0,0 +1,134 @@
+package com.huiju.estateagents.common;
+
+import com.huiju.estateagents.config.SMSProperties;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.*;
+import org.springframework.web.client.RestTemplate;
+
+import java.time.LocalDateTime;
+import java.util.*;
+
+@Slf4j
+@Configuration
+@EnableConfigurationProperties(SMSProperties.class)
+public class SMSUtils {
+    // 短信服务配置
+    SMSProperties smsProperties;
+
+    Map<String, Phone> allPhones;
+
+    @Autowired
+    public SMSUtils(SMSProperties properties) {
+        smsProperties = properties;
+        allPhones = new HashMap<>();
+    }
+
+    /**
+     * 发送验证码到 tel
+     * @param tel
+     * @return
+     */
+    public boolean sendCaptcha(String tel) {
+        Phone phone = allPhones.get(tel);
+        if (null == phone) {
+            phone = new Phone();
+            phone.setTel(tel);
+        }
+
+        phone.setCaptcha(genCaptcha(smsProperties.getCaptcha().getSize()));
+        phone.setExpire(LocalDateTime.now().plusSeconds(smsProperties.getCaptcha().getExpire()));
+        allPhones.put(tel, phone);
+
+        log.info("发送手机 {} 验证码 {}", tel, phone.getCaptcha());
+
+        String[] params = { phone.getCaptcha(), smsProperties.getCaptcha().getSign() };
+        return sendMessage(smsProperties.getCaptcha().getCode(), tel, params);
+    }
+
+    /**
+     * 校验验证码
+     * @param tel
+     * @param smsCaptcha
+     * @return
+     */
+    public boolean checkCaptcha(String tel, String smsCaptcha) {
+        Phone phone = allPhones.get(tel);
+        if (null == phone) {
+            log.error("手机号 {} 的验证码未找到", tel);
+            return false;
+        }
+
+        if (null == smsCaptcha || !smsCaptcha.equals(phone.getCaptcha())) {
+            log.error("手机号 {} 校验验证码出错, 正确: {}, 错误: {}", tel, phone.getCaptcha(), smsCaptcha);
+            return false;
+        }
+
+        LocalDateTime now = LocalDateTime.now();
+        if (now.isAfter(phone.getExpire())) {
+            log.error("手机号 {} 的验证码已过期", tel);
+            return false;
+        }
+
+        // 如果验证成功, 则从缓存中删除
+        allPhones.remove(tel);
+        return true;
+    }
+
+    public boolean sendVisitor(String tel, String name) {
+        log.info("发送手机 {} 客户名称 {}", tel, name);
+
+        String[] params = { name };
+        return sendMessage(smsProperties.getVisitor().getCode(), tel, params);
+    }
+
+    private String genCaptcha(int length) {
+        List<String> nums = new ArrayList<>();
+        for (int i = 0; i < length; i ++) {
+            int rand = (new Random()).nextInt(10);
+            nums.add(String.valueOf(rand));
+        }
+        return String.join("", nums);
+    }
+
+    private boolean sendMessage(String code, String tel, String[] params) {
+        // 发送内容
+        SMSProperties.Template message = new SMSProperties.Template();
+        message.setCode(code);
+        message.setTel(tel);
+        message.setParams(params);
+
+        // 构造 request
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.parseMediaType(smsProperties.getContentType()));
+//        String body = JSONObject.toJSONString(message);
+        HttpMethod method = HttpMethod.resolve(smsProperties.getMethod());
+        HttpEntity requestEntity = new HttpEntity(message, headers);
+
+        RestTemplate template = new RestTemplate();
+        HttpEntity<String> response = template.exchange(
+                smsProperties.getUrl(),
+                method,
+                requestEntity,
+                String.class,
+                new Object()
+        );
+
+        if (((ResponseEntity<String>) response).getStatusCodeValue() != HttpStatus.OK.value()) {
+            log.error("请求发送短信验证码失败: {}", response.toString());
+            return false;
+        }
+
+        return true;
+    }
+
+    @Data
+    public static class Phone {
+        String tel;
+        String captcha;
+        LocalDateTime expire;
+    }
+}

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

@@ -2,61 +2,58 @@ package com.huiju.estateagents.common;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
-import cn.binarywang.wx.miniapp.bean.WxMaTemplateData;
-import cn.binarywang.wx.miniapp.bean.WxMaTemplateMessage;
 import cn.binarywang.wx.miniapp.config.WxMaInMemoryConfig;
-import com.huiju.estateagents.config.WxProperties;
-import me.chanjar.weixin.common.error.WxErrorException;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.service.IMiniAppService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
-@Configuration
-@EnableConfigurationProperties(WxProperties.class)
+@Component
 public class WxUtils {
-    static WxMaService miniApp;
-
-    static WxProperties properties;
+    private ConcurrentHashMap<String, WxMaService> serives = new ConcurrentHashMap();
 
     @Autowired
-    public WxUtils(WxProperties properties) { WxUtils.properties = properties; }
+    IMiniAppService iMiniAppService;
 
-    public static WxMaService getMiniApp() {
-        return miniApp;
+    public WxMaService getMiniApp(String appid) {
+        return serives.get(appid);
     }
 
     @PostConstruct
     public void init() {
         System.out.println("-------------PostConstruct----------------");
-        WxMaInMemoryConfig config = new WxMaInMemoryConfig();
 
-        WxProperties.Miniapp miniProperty = WxUtils.properties.getMiniapp();
-
-        config.setAppid(miniProperty.getAppid());
-        config.setSecret(miniProperty.getSecret());
-        config.setToken(miniProperty.getToken());
-        config.setAesKey(miniProperty.getAesKey());
-        config.setMsgDataFormat(miniProperty.getMsgDataFormat());
+        List<TaMiniapp> taMiniappList = iMiniAppService.getAllAvaliableMiniapps();
+        if (null == taMiniappList) {
+            return;
+        }
 
-        WxUtils.miniApp = new WxMaServiceImpl();
-        WxUtils.miniApp.setWxMaConfig(config);
-        System.out.println("-------------PostConstruct- 222---------------");
-        System.out.println(WxUtils.miniApp);
+        for (TaMiniapp taMiniapp : taMiniappList) {
+            WxMaService service = newService(taMiniapp);
+            serives.put(taMiniapp.getMiniappId(), service);
+        }
     }
 
-    public static WxProperties.Tpl getTplByName(String name) {
-        for ( WxProperties.Tpl t: properties.getTpls()) {
-            if (t.getName().equals(name)) {
-                return t;
-            }
+    public WxMaService newService(TaMiniapp taMiniapp, boolean ...changeServices) {
+        WxMaInMemoryConfig config = new WxMaInMemoryConfig();
+        config.setAppid(taMiniapp.getMiniappId());
+        config.setSecret(taMiniapp.getSecret());
+        config.setToken(taMiniapp.getToken());
+        config.setAesKey(taMiniapp.getAesKey());
+        config.setMsgDataFormat("JSON");
+
+        WxMaService service = new WxMaServiceImpl();
+        service.setWxMaConfig(config);
+
+        if (changeServices.length > 0 && changeServices[0]) {
+            serives.remove(taMiniapp.getMiniappId());
+            serives.put(taMiniapp.getMiniappId(), service);
         }
-        return null;
+
+        return service;
     }
 }

src/main/java/com/huiju/estateagents/config/SMSProperties.java

@@ -0,0 +1,35 @@
+package com.huiju.estateagents.config;
+
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@Data
+@ConfigurationProperties(prefix = "sms")
+public class SMSProperties {
+    String url;
+    String method;
+    String contentType;
+    Captcha captcha;
+    Visitor visitor;
+
+    @Data
+    public static class Template {
+        String code;
+        String tel;
+        String[] params;
+    }
+
+    @Data
+    public static class Captcha {
+        String code;
+        Integer expire;
+        Integer size;
+        String sign;
+    }
+
+    @Data
+    public static class Visitor {
+        String code;
+    }
+}

src/main/java/com/huiju/estateagents/config/Swagger2Config.java

@@ -0,0 +1,37 @@
+package com.huiju.estateagents.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@Configuration
+@EnableSwagger2
+public class Swagger2Config {
+
+
+    @Bean
+    public Docket docket(){
+        return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()).select()
+                .apis(RequestHandlerSelectors.basePackage("com.huiju.estateagents.controller"))
+                .paths(PathSelectors.any()).build();
+    }
+    //构建api文档的详细信息函数
+    private ApiInfo apiInfo(){
+        return new ApiInfoBuilder()
+                //页面标题
+                .title("营销云 的 RESTful API")
+                //版本号
+                .version("1.0")
+                //描述
+                .description("API 描述")
+                .build();
+    }
+
+}

src/main/java/com/huiju/estateagents/config/WxProperties.java

@@ -1,51 +0,0 @@
-package com.huiju.estateagents.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-
-import java.util.List;
-
-@Data
-@ConfigurationProperties(prefix = "wx")
-public class WxProperties {
-    private Miniapp  miniapp;
-    private List<Tpl> tpls;
-
-    @Data
-    public static class Miniapp {
-
-        /**
-         * 设置微信小程序的appid
-         */
-        private String appid;
-
-        /**
-         * 设置微信小程序的Secret
-         */
-        private String secret;
-
-        /**
-         * 设置微信小程序消息服务器配置的token
-         */
-        private String token;
-
-        /**
-         * 设置微信小程序消息服务器配置的EncodingAESKey
-         */
-        private String aesKey;
-
-        /**
-         * 消息格式，XML或者JSON
-         */
-        private String msgDataFormat;
-
-    }
-
-    @Data
-    public static class Tpl {
-        private String name;
-        private String id;
-        private Integer keywords;
-    }
-}

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

@@ -4,7 +4,11 @@ package com.huiju.estateagents.controller;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.AliOSSUtils;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.SMSUtils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.service.ITdMiniappTemplateTypeService;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -17,6 +21,11 @@ import java.util.Map;
 @RestController
 @RequestMapping("/api")
 public class CommonController {
+    @Autowired
+    SMSUtils smsUtils;
+
+    @Autowired
+    ITdMiniappTemplateTypeService iTdMiniappTemplateTypeService;
 
     /**
      * 图片上传
@@ -33,6 +42,47 @@ public class CommonController {
         }
     }
 
+    /**
+     * 为适应 ANTD 特制的图片上传
+     * plat 中心端传 center 管理端传 admin
+     * @param multipartFile
+     * @return
+     */
+    @PostMapping("/{plat}/antd/image")
+    public Map<String, String> uploadImageForAntd(@RequestParam("file") MultipartFile multipartFile) {
+        Map<String, String> result = new HashMap<>();
+
+        try {
+            String img = AliOSSUtils.putObject(multipartFile, CommConstant.ALIOSS_DEFAULT_UPLOAD);
+
+            result.put("name", StringUtils.ifNull(multipartFile.getOriginalFilename(), multipartFile.getName()));
+            result.put("status", "done");
+            result.put("thumbUrl", img + "?x-oss-process=style/thumbnail");
+            result.put("url", img);
+
+        } catch (IOException e) {
+            result.put("status", "error");
+            result.put("message", e.getMessage());
+        }
+
+        return result;
+    }
+
+    @PostMapping("{plat}/captcha")
+    public ResponseBean sendCaptcha(@RequestParam String tel) {
+        boolean success = smsUtils.sendCaptcha(tel);
+        if (success) {
+            return ResponseBean.success("发送验证码成功");
+        } else {
+            return ResponseBean.error("验证码发送失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    @GetMapping("/center/dict/templateType")
+    public ResponseBean getAllTplTypes() {
+        return ResponseBean.success(iTdMiniappTemplateTypeService.getAllTypes());
+    }
+
     @GetMapping("/wx/awesome/dict/{typeFor}")
     public ResponseBean dicts(@PathVariable String typeFor) {
 

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

@@ -10,6 +10,10 @@ import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.service.IExtendContentService;
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
 import com.huiju.estateagents.service.ITaBuildingService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 
 /**
@@ -34,6 +39,7 @@ import java.time.LocalDateTime;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "轮播图", tags = "轮播图")
 public class ExtendContentController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(ExtendContentController.class);
@@ -53,6 +59,16 @@ public class ExtendContentController extends BaseController {
      * @param pageSize
      * @return
      */
+    @ApiOperation(value = "后台轮播图列表", notes = "后台轮播图列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "contentType", paramType = "query",value = "内容类型"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "showPosition", paramType = "query",value = "发布位置"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "status", paramType = "query",value = "状态"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "showType", paramType = "query",value = "发布类型")
+    })
     @RequestMapping(value="/admin/extendContent",method= RequestMethod.GET)
     public ResponseBean extendContentList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
@@ -60,7 +76,7 @@ public class ExtendContentController extends BaseController {
                                           @RequestParam(value = "contentType", required = false) String contentType,
                                           @RequestParam(value = "showPosition", required = false) String showPosition,
                                           @RequestParam(value = "status", required = false) Integer status,
-                                          @RequestParam(value = "showType", required = false) String showType){
+                                          @RequestParam(value = "showType", required = false) String showType,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
             IPage<ExtendContent> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
@@ -69,6 +85,7 @@ public class ExtendContentController extends BaseController {
             queryWrapper.eq(StringUtils.isNotBlank(contentType), "content_type", contentType);
             queryWrapper.eq(StringUtils.isNotBlank(showPosition), "show_position", showPosition);
             queryWrapper.eq(null!=status, "status", status);
+            queryWrapper.eq( "org_id", getOrgId(request));
             queryWrapper.orderByDesc("create_date");
             IPage<ExtendContent> result = iExtendContentService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
@@ -78,6 +95,16 @@ public class ExtendContentController extends BaseController {
     /**
      * 微信 开屏 / 轮播图
      */
+    @ApiOperation(value = "微信轮播图列表", notes = "微信轮播图列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "contentType", paramType = "query",value = "内容类型"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "targetId", paramType = "query",value = ""),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "contentId", paramType = "query",value = "内容ID"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "cityId", paramType = "query",value = "城市ID")
+    })
     @RequestMapping(value="/wx/extendContent/{showType}",method= RequestMethod.GET)
     public ResponseBean extendContentListShowType(@PathVariable(value = "showType") String showType,
                                                   @RequestParam(value = "showPosition", required = false) String showPosition,
@@ -85,8 +112,9 @@ public class ExtendContentController extends BaseController {
                                                   @RequestParam(value = "contentType", required = false) String contentType,
                                                   @RequestParam(value = "buildingId", required = false) String buildingId,
                                                   @RequestParam(value = "contentId", required = false) String contentId,
-                                                  @RequestParam(value = "cityId", required = false) Integer cityId){
-        ResponseBean responseBean= iExtendContentService.selectExtendContentListShowType(showType, showPosition, targetId,contentType, buildingId, contentId, cityId);
+                                                  @RequestParam(value = "cityId", required = false) Integer cityId,
+                                                  HttpServletRequest request){
+        ResponseBean responseBean= iExtendContentService.selectExtendContentListShowType(showType, showPosition, targetId,contentType, buildingId, contentId, cityId,getOrgId(request));
         return responseBean;
     }
 
@@ -96,11 +124,16 @@ public class ExtendContentController extends BaseController {
      * @param extendContent 实体对象
      * @return
      */
+    @ApiOperation(value = "后台轮播图保存", notes = "后台轮播图保存")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "ExtendContent", name = "extendContent", paramType = "body",value = "轮播图内容")
+    })
     @RequestMapping(value="/admin/extendContent",method= RequestMethod.POST)
-    public ResponseBean extendContentAdd(@RequestBody ExtendContent extendContent){
+    public ResponseBean extendContentAdd(@RequestBody ExtendContent extendContent, HttpServletRequest request){
         Integer cityId = iTaBuildingService.getCityById(extendContent.getBuildingId());
         extendContent.setCityId(cityId);
         extendContent.setCreateDate(LocalDateTime.now());
+        extendContent.setOrgId(getOrgId(request));
         ResponseBean  responseBean= iExtendContentService.extendContentAdd(extendContent);
           responseBean.addSuccess(extendContent);
           return responseBean;
@@ -110,6 +143,10 @@ public class ExtendContentController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
+    @ApiOperation(value = "后台轮播图删除", notes = "后台轮播图删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "payh",value = "轮播图id")
+    })
     @ResponseBody
     @RequestMapping(value="/admin/extendContent/{id}", method= RequestMethod.DELETE)
     public ResponseBean extendContentDelete(@PathVariable Integer id){
@@ -134,14 +171,20 @@ public class ExtendContentController extends BaseController {
      * @param extendContent 实体对象
      * @return
      */
+    @ApiOperation(value = "后台轮播图保存", notes = "后台轮播图保存")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "payh",value = "轮播图id"),
+            @ApiImplicitParam(dataType = "ExtendContent", name = "extendContent", paramType = "body",value = "轮播图内容")
+    })
     @RequestMapping(value="/admin/extendContent/{id}",method= RequestMethod.PUT)
     public ResponseBean extendContentUpdate(@PathVariable Integer id,
-                                        @RequestBody ExtendContent extendContent){
+                                        @RequestBody ExtendContent extendContent,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         extendContent.setContentId(id);
         try {
             Integer cityId = iTaBuildingService.getCityById(extendContent.getBuildingId());
             extendContent.setCityId(cityId);
+            extendContent.setOrgId(getOrgId(request));
             if (iExtendContentService.updateById(extendContent)){
                 responseBean.addSuccess(extendContent);
             }else {
@@ -159,6 +202,10 @@ public class ExtendContentController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
+    @ApiOperation(value = "后台轮播图查询", notes = "后台轮播图查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "payh",value = "轮播图id")
+    })
     @RequestMapping(value="/admin/extendContent/{id}",method= RequestMethod.GET)
     public ResponseBean extendContentGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();

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

@@ -0,0 +1,558 @@
+package com.huiju.estateagents.controller;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
+import com.huiju.estateagents.excel.HelpProceedAndFinish;
+import com.huiju.estateagents.excel.HelpRecordExport;
+import com.huiju.estateagents.excel.PublicCustomerExport;
+import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
+import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
+import com.huiju.estateagents.service.IHelpActivityService;
+import com.huiju.estateagents.service.IHelpInitiateRecordService;
+import com.huiju.estateagents.service.IHelpRecordService;
+import com.huiju.estateagents.service.ITaBuildingService;
+import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.ITdPosterTemplateService;
+import com.huiju.estateagents.service.TaPosterService;
+import com.huiju.estateagents.service.TaShareContentService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import org.apache.ibatis.annotations.Param;
+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 javax.servlet.http.HttpServletResponse;
+import javax.xml.crypto.Data;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+    * 助力活动  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "活动助力", tags = "活动助力")
+public class HelpActivityController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(HelpActivityController.class);
+
+    @Autowired
+    public IHelpActivityService taHelpActivityService;
+
+    @Autowired
+    private ITaBuildingService iTaBuildingService;
+    
+    @Autowired
+    private ITaPersonService taPersonService;
+    
+    @Autowired
+    private IHelpInitiateRecordService helpInitiateRecordService;
+    
+    @Autowired
+    private IHelpRecordService helpRecordService;
+    
+    @Autowired
+    private TaPosterService taPosterService;
+    
+    @Autowired
+    private TaShareContentService taShareContentService;
+
+    @Autowired
+    private HelpInitiateRecordMapper helpInitiateRecordMapper;
+    
+    @Autowired
+    private ITdPosterTemplateService tdPosterTemplateService;
+    /**
+     * 活动助力列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "活动助力列表", notes = "活动助力列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query", value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query", value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "cityId", paramType = "query", value = "城市"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query", value = "项目"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "title", paramType = "query", value = "标题"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "startDate", paramType = "query", value = "活动开始时间"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "endDate", paramType = "query", value = "活动结束时间"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "activityStatus", paramType = "query", value = "活动状态")
+    })
+    @RequestMapping(value = "/admin/helpActivity/list", method = RequestMethod.GET)
+    public ResponseBean helpActivityList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value = "cityId", required = false) Integer cityId,
+                                         @RequestParam(value = "buildingId", required = false) String buildingId,
+                                         @RequestParam(value = "title", required = false) String title,
+                                         @RequestParam(value = "startDate", required = false) String startDate,
+                                         @RequestParam(value = "endDate", required = false) String endDate,
+                                         @RequestParam(value = "activityStatus", required = false) Integer activityStatus,
+                                         HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
+        ResponseBean helpActivityList = taHelpActivityService.helpActivityList(pageNum, pageSize, cityId, buildingId, title, startDate, endDate, activityStatus, orgId);
+        return helpActivityList;
+    }
+
+    /**
+     * 活动助力列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "活动助力列表 已开始 和 未开始", notes = "活动助力列表 已开始 和 未开始")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query", value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query", value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "cityId", paramType = "query", value = "城市"),
+    })
+    @RequestMapping(value = "/admin/helpActivityEffective/list", method = RequestMethod.GET)
+    public ResponseBean helpActivityEffectiveList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value = "cityId", required = false) Integer cityId,
+                                         @RequestParam(value = "buildingId", required = false) String buildingId,
+                                         HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
+        ResponseBean helpActivityList = taHelpActivityService.helpActivityEffectiveList(pageNum, pageSize, cityId, orgId, buildingId);
+        return helpActivityList;
+    }
+
+    @ApiOperation(value = "活动助力新增", notes = "活动助力新增")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "HelpActivity", name = "parameter", paramType = "body", value = "当前对象")
+    })
+    @RequestMapping(value = "/admin/helpActivity/add", method = RequestMethod.POST)
+    public ResponseBean helpActivityAdd(@RequestBody String parameter, HttpServletRequest request) {
+        HelpActivity helpActivity = JSONObject.parseObject(parameter, HelpActivity.class);
+        ResponseBean responseBean = new ResponseBean();
+        Integer orgId = getOrgId(request);
+        Integer cityId = iTaBuildingService.getCityById(helpActivity.getBuildingId());
+        QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
+        helpActivityQueryWrapper.eq("heavy", helpActivity.getHeavy());
+        Integer heavyCount = taHelpActivityService.count(helpActivityQueryWrapper);
+        if (heavyCount != 0){
+            responseBean.addError("权重已存在，请重新编辑");
+            return responseBean;
+        }
+        helpActivity.setCityId(cityId);
+        // 活动暂且定位为未开始
+        helpActivity.setActivityStatus(1);
+        helpActivity.setStatus(1);
+        helpActivity.setWeight(0);
+        helpActivity.setIsMain(false);
+        taHelpActivityService.helpActivityAdd(helpActivity, orgId);
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     *
+     * @param id 实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value = "/helpActivity/{id}", method = RequestMethod.DELETE)
+    public ResponseBean helpActivityDelete(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (taHelpActivityService.removeById(id)) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("helpActivityDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    @ApiOperation(value = "活动助力修改", notes = "活动助力修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = HelpActivity.class, name = "helpActivity", paramType = "body", value = "当前对象"),
+    })
+    @RequestMapping(value = "admin/helpActivity/update", method = RequestMethod.PUT)
+    public ResponseBean helpActivityUpdate(@RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        HelpActivity helpActivity = JSONObject.parseObject(parameter, HelpActivity.class);
+        QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
+        helpActivityQueryWrapper.eq("heavy", helpActivity.getHeavy());
+        Integer heavyCount = taHelpActivityService.count(helpActivityQueryWrapper);
+        if (heavyCount != 0){
+            responseBean.addError("权重已存在，请重新编辑");
+            return responseBean;
+        }
+        Integer cityId = iTaBuildingService.getCityById( helpActivity.getBuildingId());
+        helpActivity.setCityId(cityId);
+        helpActivity.setHelpActivityId(helpActivity.getHelpActivityId());
+        taHelpActivityService.helpActivityUpdate(helpActivity);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "根据id查询活动助力详情", notes = "根据id查询活动助力详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "helpActivityId", paramType = "query", value = "活动状态")
+    })
+    @RequestMapping(value = "admin/helpActivity/details", method = RequestMethod.GET)
+    public ResponseBean helpActivityGet(@RequestParam(value = "helpActivityId", required = false) Integer helpActivityId) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(taHelpActivityService.getById(helpActivityId));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("helpActivityDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    @ApiOperation(value = "置顶和推首页", notes = "置顶和推首页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, name = "parameter", paramType = "body", value = "status:0置顶操作，1推首页操作,2结束活动操作,helpActivityId:助力ID")
+    })
+    @RequestMapping(value = "admin/top/update", method = RequestMethod.POST)
+    public ResponseBean top(@RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        JSONObject object = JSONObject.parseObject(parameter);
+        // 根据状态值判断是置顶还是推首页的操作
+        String activityStatus = object.getString("status");
+        String helpActivityId = object.getString("helpActivityId");
+        HelpActivity helpActivity = taHelpActivityService.getById(helpActivityId);
+        // 置顶操作
+        if (activityStatus.equals("0")) {
+            helpActivity.setWeight(Integer.valueOf(helpActivity.getWeight().equals(0) ? 1 : 0));
+        }
+        // 推首页
+        if (activityStatus.equals("1")) {
+            helpActivity.setIsMain(true == helpActivity.getIsMain() ? false : true);
+        }
+        // 结束活动操作
+        if (activityStatus.equals("2")) {
+            helpActivity.setActivityStatus(2);
+            QueryWrapper<HelpInitiateRecord> helpInitiateRecordQuery= new QueryWrapper<>();
+            helpInitiateRecordQuery.eq("help_activity_id",helpActivityId);
+                List<HelpInitiateRecord> list= helpInitiateRecordMapper.selectList(helpInitiateRecordQuery);
+                for (HelpInitiateRecord helpInitiateRecord:list){
+                    // 助力成功的不更新。
+                    if (!helpInitiateRecord.getStatus().equals(0)) {
+                        helpInitiateRecord.setStatus(2);
+                        helpInitiateRecordMapper.updateById(helpInitiateRecord);
+                    }
+                }
+        }
+        Boolean isA = taHelpActivityService.updateById(helpActivity);
+        responseBean.addSuccess(isA);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/admin/helpActivity/send/{helpActivityId}", method = RequestMethod.PUT)
+    public ResponseBean send(@PathVariable String helpActivityId, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
+        helpActivityQueryWrapper.eq("help_activity_id", helpActivityId);
+        HelpActivity helpActivity = taHelpActivityService.getOne(helpActivityQueryWrapper);
+        helpActivity.setStatus(1);
+        helpActivity.setOrgId(getOrgId(request));
+        taHelpActivityService.update(helpActivity, helpActivityQueryWrapper);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/admin/helpActivity/cancel/{helpActivityId}", method = RequestMethod.PUT)
+    public ResponseBean cancel(@PathVariable String helpActivityId, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<HelpActivity> taShareActivityQueryWrapper = new QueryWrapper<>();
+        taShareActivityQueryWrapper.eq("help_activity_id", helpActivityId);
+        HelpActivity helpActivity = taHelpActivityService.getOne(taShareActivityQueryWrapper);
+        helpActivity.setStatus(-1);
+        helpActivity.setOrgId(getOrgId(request));
+        taHelpActivityService.update(helpActivity, taShareActivityQueryWrapper);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "助力记录", notes = "助力记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query", value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query", value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "helpActivityId", paramType = "query", value = "助力ID"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "tel", paramType = "query", value = "tel"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "status", paramType = "query", value = "status: helpSucceed助力成功，helpUnderway进行中，helpUnfinished助力失败")
+    })
+    @RequestMapping(value = "admin/helpRecord", method = RequestMethod.GET)
+    public ResponseBean helpRecord(@RequestParam(value = "helpActivityId", required = false) Integer helpActivityId,
+                                   @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                   @RequestParam(value = "status", required = false) String status,
+                                   @RequestParam(value = "tel", required = false) String tel) {
+        ResponseBean helpRecord = taHelpActivityService.helpRecord(helpActivityId, status, pageNum, pageSize,tel);
+        return helpRecord;
+    }
+
+    @ApiOperation(value = "助力人详情", notes = "助力人详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query", value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query", value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "helpRecordInitiateId", paramType = "query", value = "发起助力ID"),
+    })
+    @RequestMapping(value = "admin/taHelpRecord/details", method = RequestMethod.GET)
+    public ResponseBean taHelpRecordDetails(@RequestParam(value = "helpRecordInitiateId", required = false) Integer helpRecordInitiateId,
+                                            @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        ResponseBean helpRecord = taHelpActivityService.taHelpRecordDetails(helpRecordInitiateId, pageNum, pageSize);
+        return helpRecord;
+    }
+
+    @ApiOperation(value = "核销", notes = "核销")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query", value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query", value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "helpRecordInitiateId", paramType = "query", value = "发起助力ID"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "verifyCode", paramType = "query", value = "核销码"),
+    })
+    @RequestMapping(value = "admin/helpInitiateRecordVerify", method = RequestMethod.POST)
+    public ResponseBean helpInitiateRecordVerify(@RequestParam(value = "helpRecordInitiateId", required = false) Integer helpRecordInitiateId,
+                                                 @RequestParam(value = "verifyCode", required = false) String verifyCode) {
+        ResponseBean helpRecord = taHelpActivityService.helpInitiateRecordVerify(helpRecordInitiateId, verifyCode);
+        return helpRecord;
+    }
+
+    /**
+     * 导出数据 成功/进行/失败
+     *
+     * @param request
+     * @param response
+     * @throws IOException
+     */
+    @GetMapping("/admin/HelpInitiateRecordSucceed/export")
+    public void getCustomerExportList(HttpServletRequest request,
+                                      HttpServletResponse response,
+                                      @RequestParam(value = "tel", required = false) String tel,
+                                      @RequestParam(value = "helpActivityId", required = false) Integer helpActivityId,
+                                      @RequestParam(value = "condition", required = false) String condition) throws IOException {
+        //        response.setContentType("application/vnd.ms-excel");
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=助力活动发起人.xlsx");
+
+        Integer orgId = getOrgId(request);
+
+        Integer pageCode = 0;
+        Integer pageSize = 100;
+        // 总页数
+        Integer pageCount = 0;
+
+        /**
+         * 助力活动发起者
+         */
+        // 设置读取的class
+       // code：helpSucceed助力成功，helpUnderway进行中，helpUnfinished助力失败
+        if ("helpSucceed".equals(condition)){
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), HelpInitiateRecordSucceed.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("助力成功").build();
+            Integer count = taHelpActivityService.getHelpInitiateRecordSucceed(tel,helpActivityId);
+            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+            List<HelpInitiateRecordSucceed> publicList = null;
+            do {
+                publicList = taHelpActivityService.getHelpInitiateRecordSucceedExportList(pageCode * pageSize, pageSize,tel,helpActivityId);
+                excelWriter.write(publicList, writeSheet);
+
+                pageCode++;
+            } while (pageCode <= pageCount);
+
+            // finish 会帮忙关闭流
+            excelWriter.finish();
+        }else {
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), HelpProceedAndFinish.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("助力成功").build();
+            Integer count = taHelpActivityService.getHelpInitiateRecordSucceed(tel,helpActivityId);
+            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+            List<HelpProceedAndFinish> publicList = null;
+            do {
+                publicList = taHelpActivityService.getHelpProceedAndFinishExportList(pageCode * pageSize, pageSize,tel,helpActivityId,condition);
+                excelWriter.write(publicList, writeSheet);
+
+                pageCode++;
+            } while (pageCode <= pageCount);
+
+            // finish 会帮忙关闭流
+            excelWriter.finish();
+        }
+
+    }
+
+    /**
+     * 助力活动查询当前助力者记录
+     *
+     * @param request
+     * @param response
+     * @throws IOException
+     */
+    @GetMapping("/admin/helpRecord/export")
+    public void gethelpRecordExport(HttpServletRequest request,
+                                      HttpServletResponse response,
+                                      @RequestParam(value = "helpRecordInitiateId", required = false) Integer helpRecordInitiateId) throws IOException {
+        //        response.setContentType("application/vnd.ms-excel");
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=助力活动发起人.xlsx");
+
+        Integer orgId = getOrgId(request);
+
+        Integer pageCode = 0;
+        Integer pageSize = 100;
+        // 总页数
+        Integer pageCount = 0;
+
+        /**
+         * 助力活动发起者
+         */
+        // 设置读取的class
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), HelpRecordExport.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("助力成功").build();
+            Integer count = taHelpActivityService.getHelpRecord(helpRecordInitiateId);
+            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+            List<HelpRecordExport> publicList = null;
+            do {
+                publicList = taHelpActivityService.getHelpRecordExportList(pageCode * pageSize, pageSize,helpRecordInitiateId);
+                excelWriter.write(publicList, writeSheet);
+
+                pageCode++;
+            } while (pageCode <= pageCount);
+
+            // finish 会帮忙关闭流
+            excelWriter.finish();
+    }
+    
+    @ApiOperation(value = "微信端根据id查询活动助力详情", notes = "根据id查询活动助力详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "helpActivityId", paramType = "path", value = "活动状态")
+    })
+    @RequestMapping(value = "/wx/helpActivity/{helpActivityId}", method = RequestMethod.GET)
+    public ResponseBean wxHelpActivityGet(@PathVariable(value = "helpActivityId") Integer helpActivityId,
+                                          @RequestParam(value = "initiateId",required = false) Integer initiateId,HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        Integer orgId = getOrgId(request);
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        Map<String,Object> map = new HashMap<>();
+        try {
+            //活动信息
+            HelpActivity helpActivity = taHelpActivityService.getById(helpActivityId);
+            QueryWrapper<HelpInitiateRecord> helpInitiateRecordQueryWrapper = new QueryWrapper<>();
+            helpInitiateRecordQueryWrapper.eq("org_id",orgId);
+            helpInitiateRecordQueryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
+            helpInitiateRecordQueryWrapper.eq("status",CommConstant.STATUS_UNACCALIMED);
+            //已经成功的助力
+            List<HelpInitiateRecord> helpInitiateRecordList = helpInitiateRecordMapper.selectList(helpInitiateRecordQueryWrapper);
+            helpActivity.setSuccessNum(helpInitiateRecordList.size());
+            map.put("helpActivity",helpActivity);
+            
+            //发起者信息
+            HelpInitiateRecord helpInitiateRecord = null;
+             if (null != initiateId){
+                 helpInitiateRecord = helpInitiateRecordService.getById(initiateId);
+             }else {
+                 QueryWrapper<HelpInitiateRecord> initiateRecordQueryWrapper = new QueryWrapper<>();
+                 initiateRecordQueryWrapper.eq("org_id",orgId);
+                 initiateRecordQueryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
+                 initiateRecordQueryWrapper.eq("person_id",person.getPersonId());
+                 helpInitiateRecord = helpInitiateRecordService.getOne(initiateRecordQueryWrapper);
+             }
+             
+             //判断是否发起者
+            if (null != helpInitiateRecord){
+                helpActivity.setHelpStatus(CommConstant.HELP_STATUS_INITIATE);
+        
+                //助力者信息
+                QueryWrapper<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
+                helpRecordQueryWrapper.eq("org_id",orgId);
+                helpRecordQueryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
+                helpRecordQueryWrapper.eq("help_record_initiate_id",helpInitiateRecord.getHelpRecordInitiateId());
+                List<HelpRecord> helpRecordList = helpRecordService.list(helpRecordQueryWrapper);
+                helpRecordList.forEach(e -> {
+                    if (e.getPersonId().equals(person.getPersonId())){
+                        map.put("isJoin",true);
+                    }
+                });
+        
+                map.put("helpInitiateRecord",helpInitiateRecord);
+                map.put("helpRecordList",helpRecordList);
+            }
+    
+            //获取海报信息
+            QueryWrapper<TaPoster> posterQueryWrapper = new QueryWrapper<>();
+            posterQueryWrapper.eq("target_type",CommConstant.HELP_ACTIVITY);
+            posterQueryWrapper.eq("target_id",helpActivityId);
+            posterQueryWrapper.eq("org_id",orgId);
+            List<TaPoster> postList = taPosterService.list(posterQueryWrapper);
+            map.put("postList",postList);
+    
+            QueryWrapper<TdPosterTemplate> tdPosterTemplateQueryWrapper = new QueryWrapper<>();
+            //tdPosterTemplateQueryWrapper.eq("org_id",orgId);
+            tdPosterTemplateQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+            tdPosterTemplateQueryWrapper.eq("type",CommConstant.HELP_ACTIVITY);
+            List<TdPosterTemplate> posterTemplateList = tdPosterTemplateService.list(tdPosterTemplateQueryWrapper);
+            map.put("posterTemplateList",posterTemplateList);
+            
+            //获取分享信息
+            QueryWrapper<TaShareContent> taShareContentQueryWrapper = new QueryWrapper<>();
+            taShareContentQueryWrapper.eq("share_content_type",CommConstant.HELP_ACTIVITY);
+            taShareContentQueryWrapper.eq("target_id",helpActivityId);
+            taShareContentQueryWrapper.eq("org_id",orgId);
+            List<TaShareContent> shareContentList = taShareContentService.list(taShareContentQueryWrapper);
+            map.put("shareContentList",shareContentList);
+    
+            responseBean.addSuccess(map);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("helpActivityDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    @ApiOperation(value = "微信端查询拼团和助力推首页的活动的", notes = "微信端查询拼团和助力推首页的活动的")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "buildingId", paramType = "query", value = "活动状态"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "type", paramType = "query", value = "1助力，2拼团"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "type", paramType = "query", value = "cityId首页专用")
+    })
+    @RequestMapping(value = "/wx/helpActivityAndGroup", method = RequestMethod.GET)
+    public ResponseBean wxhelpActivityAndGroup(HttpServletRequest request,
+                                               @RequestParam(value = "buildingId",required = false) String buildingId,
+                                               @RequestParam(value = "cityId",required = false) String cityId) {
+            ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request),buildingId,cityId);
+                return lsit;
+        }
+
+}

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

@@ -0,0 +1,265 @@
+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.common.CommConstant;
+import com.huiju.estateagents.entity.HelpActivity;
+import com.huiju.estateagents.entity.HelpInitiateRecord;
+import com.huiju.estateagents.entity.HelpRecord;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.service.IHelpActivityService;
+import com.huiju.estateagents.service.IHelpInitiateRecordService;
+import com.huiju.estateagents.service.IHelpRecordService;
+import com.huiju.estateagents.service.ITaPersonService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+    * 助力活动发起人员记录  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@RestController
+@RequestMapping("/api")
+public class HelpInitiateRecordController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(HelpInitiateRecordController.class);
+
+    @Autowired
+    public IHelpInitiateRecordService taHelpInitiateRecordService;
+    
+    @Autowired
+    private ITaPersonService taPersonService;
+    
+    @Autowired
+    public IHelpRecordService helpRecordService;
+    
+    @Autowired
+    public IHelpActivityService taHelpActivityService;
+    
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/helpInitiateRecord",method= RequestMethod.GET)
+    public ResponseBean helpInitiateRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<HelpInitiateRecord> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<HelpInitiateRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<HelpInitiateRecord> result = taHelpInitiateRecordService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpInitiateRecordList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param helpInitiateRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/helpInitiateRecord",method= RequestMethod.POST)
+    public ResponseBean helpInitiateRecordAdd(@RequestBody HelpInitiateRecord helpInitiateRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (taHelpInitiateRecordService.save(helpInitiateRecord)){
+                responseBean.addSuccess(helpInitiateRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpInitiateRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/helpInitiateRecord/{id}", method= RequestMethod.DELETE)
+    public ResponseBean helpInitiateRecordDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(taHelpInitiateRecordService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpInitiateRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param helpInitiateRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/helpInitiateRecord/{id}",method= RequestMethod.PUT)
+    public ResponseBean helpInitiateRecordUpdate(@PathVariable Integer id,
+                                        @RequestBody HelpInitiateRecord helpInitiateRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (taHelpInitiateRecordService.updateById(helpInitiateRecord)){
+                responseBean.addSuccess(helpInitiateRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpInitiateRecordUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/helpInitiateRecord/{id}",method= RequestMethod.GET)
+    public ResponseBean helpInitiateRecordGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(taHelpInitiateRecordService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpInitiateRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 微信端分页查询我发起的助力活动
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/helpInitiateRecord",method= RequestMethod.GET)
+    public ResponseBean wxhelpInitiateRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                                 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                 HttpServletRequest request){
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        ResponseBean responseBean = new ResponseBean();
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        try {
+            //分页获取数据
+            responseBean = taHelpInitiateRecordService.getInitiateRecord(pageNumber, pageSize,orgId,person.getPersonId());
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpInitiateRecordList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    
+    /**
+     * 微信端保存发起活动对象
+     * @param helpInitiateRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/wx/helpInitiateRecord",method= RequestMethod.POST)
+    public ResponseBean wxHelpInitiateRecordAdd(@RequestBody HelpInitiateRecord helpInitiateRecord,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        Map<String,Object> map = new HashMap<>();
+        HelpActivity helpActivity = taHelpActivityService.getById(helpInitiateRecord.getHelpActivityId());
+        if(helpActivity.getActivityStatus().equals(CommConstant.ACTIVITY_STATUS_FINISH)){
+            return ResponseBean.error("活动已结束", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        if(helpActivity.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
+            return ResponseBean.error("活动已失效", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        try {
+ 
+            //查看是否发起过助力
+            QueryWrapper<HelpInitiateRecord> helpInitiateRecordQueryWrapper = new QueryWrapper<>();
+            helpInitiateRecordQueryWrapper.eq("help_activity_id",helpInitiateRecord.getHelpActivityId());
+            helpInitiateRecordQueryWrapper.eq("org_id",orgId);
+            helpInitiateRecordQueryWrapper.eq("person_id",person.getPersonId());
+            helpInitiateRecordQueryWrapper.ne("status",-1);
+            HelpInitiateRecord recordServiceOne = taHelpInitiateRecordService.getOne(helpInitiateRecordQueryWrapper);
+            if (null != recordServiceOne){
+                map.put("helpInitiateRecord",recordServiceOne);
+                QueryWrapper<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
+                helpRecordQueryWrapper.eq("help_activity_id",helpInitiateRecord.getHelpActivityId());
+                helpRecordQueryWrapper.eq("org_id",orgId);
+                helpRecordQueryWrapper.eq("help_record_initiate_id",recordServiceOne.getHelpRecordInitiateId());
+                List<HelpRecord> list = helpRecordService.list(helpRecordQueryWrapper);
+                map.put("helpRecordList",list);
+                responseBean.addSuccess(map);
+                return responseBean;
+            }
+ 
+            helpInitiateRecord.setPersonId(person.getPersonId());
+            helpInitiateRecord.setVerificationStatus(CommConstant.STATUS_UNACCALIMED);
+            helpInitiateRecord.setCreateDate(LocalDateTime.now());
+            helpInitiateRecord.setOrgId(orgId);
+            helpInitiateRecord.setStatus(1);
+            if (taHelpInitiateRecordService.save(helpInitiateRecord)){
+                map.put("helpInitiateRecord",helpInitiateRecord);
+                map.put("helpRecordList",new ArrayList<>());
+                responseBean.addSuccess(map);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpInitiateRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,184 @@
+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.HelpRecord;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.service.IHelpRecordService;
+import com.huiju.estateagents.service.ITaPersonService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+    * 助力活动助力人员记录  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-10-17
+ */
+@RestController
+@RequestMapping("/api")
+public class HelpRecordController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(HelpRecordController.class);
+
+    @Autowired
+    public IHelpRecordService taHelpRecordService;
+    
+    @Autowired
+    private ITaPersonService taPersonService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/helpRecord",method= RequestMethod.GET)
+    public ResponseBean helpRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<HelpRecord> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<HelpRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<HelpRecord> result = taHelpRecordService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpRecordList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param helpRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/helpRecord",method= RequestMethod.POST)
+    public ResponseBean helpRecordAdd(@RequestBody HelpRecord helpRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (taHelpRecordService.save(helpRecord)){
+                responseBean.addSuccess(helpRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/helpRecord/{id}", method= RequestMethod.DELETE)
+    public ResponseBean helpRecordDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(taHelpRecordService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param helpRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/helpRecord/{id}",method= RequestMethod.PUT)
+    public ResponseBean helpRecordUpdate(@PathVariable Integer id,
+                                        @RequestBody HelpRecord helpRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (taHelpRecordService.updateById(helpRecord)){
+                responseBean.addSuccess(helpRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpRecordUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/helpRecord/{id}",method= RequestMethod.GET)
+    public ResponseBean helpRecordGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(taHelpRecordService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    
+    /**
+     * 微信端助力者助力
+     * @param helpRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/wx/helpRecord",method= RequestMethod.POST)
+    public ResponseBean wxHelpRecordAdd(@RequestBody HelpRecord helpRecord, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        try {
+            responseBean = taHelpRecordService.saveBooster(helpRecord,orgId,person);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("helpRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -6,17 +6,19 @@ import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.service.ISysTokenService;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.WxUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.mapper.TaShareMapper;
-import com.huiju.estateagents.service.IMiniAppService;
-import com.huiju.estateagents.service.ITaCustomerPersonService;
-import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.*;
 import com.huiju.estateagents.common.JWTUtils;
-import com.huiju.estateagents.service.ITaRecommendCustomerService;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
@@ -33,26 +35,44 @@ import java.util.Map;
 
 @RestController
 @RequestMapping("/api/wx")
-public class MiniAppController {
+public class MiniAppController extends BaseController {
     @Autowired
     private ITaPersonService taPersonService;
 
-    final WxMaService wxService = WxUtils.getMiniApp();
-
     @Autowired
     private IMiniAppService miniAppService;
 
     @Autowired
     private ITaRecommendCustomerService taRecommendCustomerService;
 
-    @Autowired
-    private ITaCustomerPersonService taCustomerPersonService;
-
     @Resource
     private ApplicationContext applicationContext;
 
     @Autowired
-    private TaShareMapper taShareMapper;
+    private ITaOrgService taOrgService;
+
+    @Autowired
+    private ISysTokenService sysTokenService;
+
+    @Autowired
+    private ITaMiniappService taMiniappService;
+
+    @Autowired
+    private ITaSharePersonFromService taSharePersonFromService;
+
+    @Autowired
+    private ITaBuildingDynamicService buildingDynamicService;
+
+    @Autowired
+    private  ITaNewsService newsService;
+
+    @Autowired
+    private ITaUserService userService;
+
+    @Autowired
+    private ITaPersonBuildingService personBuildingService;
+
+
 
 
 
@@ -71,31 +91,51 @@ public class MiniAppController {
      * 登陆接口
      */
     @PostMapping("/login")
-    public ResponseBean login(String code,@RequestParam(required = false) String from,@RequestParam(required = false)String recommender) {
-        if (StringUtils.isBlank(code)) {
+    public ResponseBean login(
+            String code,
+            @RequestParam(required = false) String from,
+            @RequestParam(required = false)String recommender,
+            @RequestParam(required = false)String targetId,
+            HttpServletRequest request) {
+        String appid = request.getHeader("appid");
+
+         if (StringUtils.isBlank(code)) {
             return ResponseBean.error("参数 code 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
-        try {
-            WxMaJscode2SessionResult session = miniAppService.getSessionInfo(code);
+        if (StringUtils.isBlank(appid)) {
+            return ResponseBean.error("Header 参数 appid 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
 
+        try {
+            TaMiniapp miniapp = taMiniappService.getById(appid);
+            WxMaJscode2SessionResult session = miniAppService.getSessionInfo(code, appid);
+            Integer orgId =miniapp.getOrgId();
             Map<String, String> miniResp = new HashMap<>();
             miniResp.put("openid", session.getOpenid());
             miniResp.put("sessionKey", session.getSessionKey());
             miniResp.put("unionid", session.getUnionid());
-            miniResp.put("token", JWTUtils.newToken(session.getOpenid()));
+            miniResp.put("name",miniapp.getName());
+
             //如果是分享进来且没有进入过小程序，给分享人发放积分
             QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
             personQueryWrapper.eq("mini_openid",session.getOpenid());
+            personQueryWrapper.eq("org_id",orgId);
             int count = taPersonService.count(personQueryWrapper);
 
-            if(from.contains("share") && StringUtils.isNotBlank(recommender) && count>0){
+            if(null!=from&&from.contains("share") && StringUtils.isNotBlank(recommender) && count>0){
                 // 添加积分
-                 applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll));
+                 applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll, orgId));
             }
-            TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid());
+
+            TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid(), orgId);
             if (null == taPerson) {
                 return ResponseBean.error("发生未知错误", ResponseBean.ERROR_UNAVAILABLE);
             }
+            Map<Object,Object> map = new HashMap<>();
+            map.put("openId",session.getOpenid());
+            map.put("orgId",orgId);
+            map.put("personId",taPerson.getPersonId());
+            miniResp.put("token", JWTUtils.newTokenByMap(map));
             if(StringUtils.isEmpty(taPerson.getFromCode())){
                 taPerson.setFromCode(from);
             }
@@ -108,19 +148,76 @@ public class MiniAppController {
                     }
                 }
             }
+            taPerson.setMiniappId(appid);
             taPersonService.updateById(taPerson);
+            if(StringUtils.isNotBlank(from) &&StringUtils.isNotBlank(recommender) &&StringUtils.isNotBlank(targetId)){
+                TaSharePersonFrom taSharePersonFrom = new TaSharePersonFrom();
+                TaPerson recommenderPerson = taPersonService.getById(recommender);
+                taSharePersonFrom.setCreateDate(LocalDateTime.now());
+                taSharePersonFrom.setOrgId(getOrgId(request));
+                taSharePersonFrom.setPersonId(taPerson.getPersonId());
+                taSharePersonFrom.setSharePersonType(recommenderPerson.getPersonType());
+                taSharePersonFrom.setTargetId(targetId);
+                taSharePersonFrom.setTargetType(from);
+                if(CommConstant.PERSON_REALTY_CONSULTANT.equals(recommenderPerson.getPersonType())){
+                    taSharePersonFrom.setSharePerson(recommenderPerson.getUserId().toString());
+                }else {
+                    taSharePersonFrom.setSharePerson(recommenderPerson.getPersonId());
+                }
+                QueryWrapper<TaSharePersonFrom> sharePersonFromQueryWrapper = new QueryWrapper<>();
+                sharePersonFromQueryWrapper.eq("person_id",taPerson.getPersonId());
+                if(from.equals("dynamic_share")){ // activity_share
+                    taSharePersonFrom.setStatus(CommConstant.STATUS_UNACCALIMED);
+                    TaBuildingDynamic buildingDynamic = buildingDynamicService.getById(targetId);
+                    taSharePersonFrom.setBuildingId(buildingDynamic.getBuildingId());
+                    sharePersonFromQueryWrapper.eq("building_id",buildingDynamic.getBuildingId());
+                }else {
+                    taSharePersonFrom.setStatus(CommConstant.STATUS_NORMAL);
+                }
+                if (from.contains("card")){
+                    // 因为targetId 是 personId ，需要查询出 userId
+                    TaPerson person = taPersonService.getById(targetId);
+
+                    QueryWrapper<TaPersonBuilding> personBuildingQueryWrapper = new QueryWrapper<>();
+                    personBuildingQueryWrapper.eq("user_id",person.getUserId());
+                    TaPersonBuilding personBuilding = personBuildingService.getOne(personBuildingQueryWrapper);
+                    taSharePersonFrom.setBuildingId(personBuilding.getBuildingId());
+                    sharePersonFromQueryWrapper.eq("building_id",personBuilding.getBuildingId());
+                }else if (from.contains("news")){
+                    TaNews news = newsService.getById(targetId);
+                    taSharePersonFrom.setBuildingId(news.getBuildingId());
+                    sharePersonFromQueryWrapper.eq("building_id",news.getBuildingId());
+                }else if (from.contains("building")){
+                    taSharePersonFrom.setBuildingId(targetId);
+                    sharePersonFromQueryWrapper.eq("building_id",targetId);
+                }
+                Integer isFirstTime = taSharePersonFromService.count(sharePersonFromQueryWrapper);
+                if(isFirstTime>0){
+                    taSharePersonFrom.setIsFirstTime(false);
+                }else {
+                    taSharePersonFrom.setIsFirstTime(true);
+                }
+                taSharePersonFromService.save(taSharePersonFrom);
+            }
 
             taPerson.setPassword(null);
 
             // 获取其余信息
             Map<String, Object> extraInfo = taPersonService.getExtraInfo(taPerson.getPersonId());
-
+            if (CommConstant.PERSON_REALTY_CONSULTANT.equals(taPerson.getPersonType())){
+                QueryWrapper<TaOrg>orgQueryWrapper = new QueryWrapper<>();
+                orgQueryWrapper.eq("org_id",taPerson.getOrgId());
+                TaOrg org = taOrgService.getOne(orgQueryWrapper);
+                taPerson.setOrg(org);
+            }
             Map<String, Object> result = new HashMap<>();
             result.put("miniApp", miniResp);
             result.put("person", taPerson);
             result.put("extraInfo", extraInfo);
             result.put("miniAuthorized", null != taPerson.getAvatarurl() && taPerson.getAvatarurl().indexOf("wx.qlogo.cn") > 0);
 
+            String token = miniResp.get("token");
+            sysTokenService.saveToken(token);
 
             return ResponseBean.success(result);
         } catch (WxErrorException e) {
@@ -134,7 +231,7 @@ public class MiniAppController {
      */
     @PostMapping("/logout")
     public ResponseBean logout(HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         List<TaPerson> persons = taPersonService.getPersonsByOpenId(openid);
         if (null == persons || persons.size() == 0) {
             return ResponseBean.success("");
@@ -149,10 +246,11 @@ public class MiniAppController {
      */
     @PostMapping("/signup")
     public ResponseBean info(@RequestBody String paramStr, HttpServletRequest request) {
+        String appid = request.getHeader("appid");
         TaPerson person = null;
-
+        TaMiniapp miniapp = taMiniappService.getById(appid);
         if (null == paramStr || "".equals(paramStr.trim()) || "{}".equals(paramStr.trim())) {
-            String openid = JWTUtils.getSubject(request);
+            String openid = getOpenId(request);
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
             if (null == taPersons || taPersons.size() != 1) {
                 return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -172,18 +270,19 @@ public class MiniAppController {
             String iv = params.getString("iv");
 
             // 用户信息校验
-            if (!miniAppService.checkUserInfo(sessionKey, rawData, signature)) {
+            if (!miniAppService.checkUserInfo(sessionKey, rawData, signature, appid)) {
                 return ResponseBean.error("校验参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
             }
 
             // 解密用户信息
-            WxMaUserInfo userInfo = miniAppService.getUserInfo(sessionKey, encryptedData, iv);
+            WxMaUserInfo userInfo = miniAppService.getUserInfo(sessionKey, encryptedData, iv, appid);
 
             // 更新或保存用户信息
             person = taPersonService.mergePersonWxInfo(userInfo);
             if (null == person) {
                 return ResponseBean.error("发生未知错误", ResponseBean.ERROR_UNAVAILABLE);
             }
+            taPersonService.upDatePersonCityToId(person.getPersonId());
         }
 
         // 获取其余信息
@@ -193,6 +292,7 @@ public class MiniAppController {
         Map<String, Object> result = new HashMap<>();
         result.put("person", person);
         result.put("extraInfo", extraInfo);
+        result.put("miniApp",miniapp);
 
         return ResponseBean.success(result);
     }
@@ -202,6 +302,7 @@ public class MiniAppController {
      */
     @PostMapping("/userPhone")
     public ResponseBean phone(@RequestBody String paramStr, HttpServletRequest request) {
+        String appid = request.getHeader("appid");
         JSONObject params = JSONObject.parseObject(paramStr);
         if (null == params) {
             return ResponseBean.error("校验参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
@@ -212,18 +313,17 @@ public class MiniAppController {
         String iv = params.getString("iv");
 
         // 解密
-        WxMaPhoneNumberInfo phoneNoInfo = miniAppService.getPhoneNoInfo(sessionKey, encryptedData, iv);
+        WxMaPhoneNumberInfo phoneNoInfo = miniAppService.getPhoneNoInfo(sessionKey, encryptedData, iv, appid);
 
         // 更新用户绑定手机
-        String openid = JWTUtils.getSubject(request);
-        taPersonService.updatePersonPhone(openid, phoneNoInfo.getPhoneNumber());
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        taPersonService.updatePersonPhone(openid, phoneNoInfo.getPhoneNumber(),orgId);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
-        person.setPersonType(CommConstant.PERSON_ESTATE_AGENT);
-        taPersonService.updateById(person);
         QueryWrapper<TaRecommendCustomer> cus= new QueryWrapper<>();
         cus.eq("phone",phoneNoInfo.getPhoneNumber());
         cus.orderByDesc("create_date");
@@ -257,24 +357,20 @@ public class MiniAppController {
 //            if(list.size()<=0){
 //                taCustomerPersonService.insertBean(person.getPersonId(),customers.getCustomerId());
 //            }
-        } else{
-            TaRecommendCustomer reCustomer = new TaRecommendCustomer();
-            reCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
-            reCustomer.setName(person.getNickname());
-            reCustomer.setPhone(phoneNoInfo.getPhoneNumber());
-            reCustomer.setSex(Integer.valueOf(person.getGender()));
-            reCustomer.setPersonId(person.getPersonId());
-            reCustomer.setPicture(person.getAvatarurl());
-            reCustomer.setCountry(person.getCountry());
-            reCustomer.setCity(person.getCity());
-            reCustomer.setProvince(person.getProvince());
-            reCustomer.setEntryType(CommConstant.ENTRY_VOLUNTEER);
-            reCustomer.setCreateDate(LocalDateTime.now());
-            reCustomer.setReportRecommendStatus(CommConstant.READY);
-            if(!taRecommendCustomerService.save(reCustomer)){
-                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-            }
         }
+//        else{
+//            TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
+//            taRecommendCustomer.setPersonId(person.getPersonId());
+//            taRecommendCustomer.setPicture(person.getAvatarurl());
+//            taRecommendCustomer.setCountry(person.getCountry());
+//            taRecommendCustomer.setCity(person.getCity());
+//            taRecommendCustomer.setProvince(person.getProvince());
+//            taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+//            taRecommendCustomer.setOrgId(getOrgId(request));
+//            taRecommendCustomer.setEntryType(CommConstant.ENTRY_VOLUNTEER);
+//            taRecommendCustomer.setSex(Integer.getInteger(person.getGender()));
+//
+//        }
         return ResponseBean.success(phoneNoInfo);
     }
 
@@ -283,8 +379,9 @@ public class MiniAppController {
      * @return
      */
     @PostMapping("/qrcode")
-    public ResponseBean qrcode(@RequestBody String paramsStr) {
-        return miniAppService.getQrCode(paramsStr);
+    public ResponseBean qrcode(@RequestBody String paramsStr, HttpServletRequest request) {
+        String appid = request.getHeader("appid");
+        return miniAppService.getQrCode(paramsStr, appid);
     }
 
     /**
@@ -307,4 +404,15 @@ public class MiniAppController {
             return ResponseBean.error("获取二维码参数失败: " + e.getMessage(), HttpStatus.SC_INTERNAL_SERVER_ERROR);
         }
     }
+
+
+    public Integer getOrgId(HttpServletRequest request){
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("orgId")){
+            return Integer.valueOf(map.get("orgId").toString());
+        }
+
+        return null;
+    }
 }

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

@@ -1,20 +1,21 @@
 package com.huiju.estateagents.controller;
 
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.service.IStatisticalService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDate;
-import java.util.Date;
 
 /**
  * 数据统计
  */
 @RestController
 @RequestMapping("/api")
-public class StatisticalController {
+public class StatisticalController extends BaseController {
 
     @Autowired
     private IStatisticalService iStatisticalService;
@@ -24,8 +25,8 @@ public class StatisticalController {
      * @return
      */
     @GetMapping(value = "/admin/indexStatistical")
-    public ResponseBean indexStatistical() {
-        return iStatisticalService.indexStatistical();
+    public ResponseBean indexStatistical(HttpServletRequest request) {
+        return iStatisticalService.indexStatistical(getOrgId(request));
     }
 
     /**
@@ -35,8 +36,9 @@ public class StatisticalController {
     @GetMapping(value = "/admin/selectActiveUserCount")
     public ResponseBean selectActiveUserCount(@RequestParam String dateType,
                                               @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) {
-        return iStatisticalService.selectActiveUserCount(dateType, startDate,endDate);
+                                              @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate,
+                                              HttpServletRequest request) {
+        return iStatisticalService.selectActiveUserCount(getOrgId(request), dateType, startDate,endDate);
     }
 
     /**
@@ -45,8 +47,9 @@ public class StatisticalController {
      */
     @GetMapping(value = "/admin/selectNewsUserCount")
     public ResponseBean selectNewsUserCount(@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) {
-        return iStatisticalService.selectNewsUserCount(startDate, endDate);
+                                            @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate,
+                                            HttpServletRequest request) {
+        return iStatisticalService.selectNewsUserCount(getOrgId(request), startDate, endDate);
     }
 
     /**
@@ -54,8 +57,9 @@ public class StatisticalController {
      * @return
      */
     @GetMapping(value = "/admin/selectConversion")
-    public ResponseBean selectConversion(@RequestParam("conversion") String conversion) {
-        return iStatisticalService.selectConversion(conversion);
+    public ResponseBean selectConversion(@RequestParam("conversion") String conversion,
+                                         HttpServletRequest request) {
+        return iStatisticalService.selectConversion(getOrgId(request), conversion);
     }
 
     /**
@@ -70,8 +74,9 @@ public class StatisticalController {
                                            @RequestParam(value = "buildingId", required = false) String buildingId,
                                            @RequestParam(value = "eventType", required = false) String eventType,
                                            @RequestParam(value = "event", required = false) String event,
-                                           @RequestParam(value = "activity", required = false) String activity) {
-        return iStatisticalService.selectUserBehavior(pageNum, pageSize, startDate, endDate, buildingId, eventType, event, activity);
+                                           @RequestParam(value = "activity", required = false) String activity,
+                                           HttpServletRequest request) {
+        return iStatisticalService.selectUserBehavior(pageNum, pageSize, getOrgId(request), startDate, endDate, buildingId, eventType, event, activity);
     }
 
     /**
@@ -80,8 +85,9 @@ public class StatisticalController {
      */
     @GetMapping(value = "/admin/selectEventAll")
     public ResponseBean selectEventAll(@RequestParam(required = false) String event,
-                                              @RequestParam(required = false) String personId) {
-        return iStatisticalService.selectEventAll(event, personId);
+                                       @RequestParam(required = false) String personId,
+                                       HttpServletRequest request) {
+        return iStatisticalService.selectEventAll(getOrgId(request), event, personId);
     }
 
 
@@ -91,8 +97,9 @@ public class StatisticalController {
      */
     @GetMapping(value = "/admin/selectUserResource")
     public ResponseBean selectUserResource(@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) {
-        return iStatisticalService.selectUserResource(startDate, endDate);
+                                           @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate,
+                                           HttpServletRequest request) {
+        return iStatisticalService.selectUserResource(getOrgId(request), startDate, endDate);
     }
 
 
@@ -101,8 +108,8 @@ public class StatisticalController {
      * @return
      */
     @GetMapping(value = "/admin/selectUserCount")
-    public ResponseBean selectUserResource() {
-        return iStatisticalService.selectUserCount();
+    public ResponseBean selectUserResource(HttpServletRequest request) {
+        return iStatisticalService.selectUserCount(getOrgId(request));
     }
 
     /**
@@ -110,8 +117,8 @@ public class StatisticalController {
      * @return
      */
     @GetMapping(value = "/admin/selectRegisteredCount")
-    public ResponseBean selectRegisteredCount() {
-        return iStatisticalService.selectRegisteredCount();
+    public ResponseBean selectRegisteredCount(HttpServletRequest request) {
+        return iStatisticalService.selectRegisteredCount(getOrgId(request));
     }
 
     /**
@@ -120,8 +127,9 @@ public class StatisticalController {
      */
     @GetMapping(value = "/admin/selectRecentlyCount")
     public ResponseBean selectRecentlyCount(@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) {
-        return iStatisticalService.selectRecentlyCount(startDate, endDate);
+                                            @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                            HttpServletRequest request) {
+        return iStatisticalService.selectRecentlyCount(getOrgId(request), startDate, endDate);
     }
 
     /**
@@ -129,8 +137,8 @@ public class StatisticalController {
      * @return
      */
     @GetMapping(value = "/admin/selectSexUser")
-    public ResponseBean selectSexUser() {
-        return iStatisticalService.selectSexUser();
+    public ResponseBean selectSexUser(HttpServletRequest request) {
+        return iStatisticalService.selectSexUser(getOrgId(request));
     }
 
     /**
@@ -138,8 +146,9 @@ public class StatisticalController {
      * @return
      */
     @GetMapping(value = "/admin/selectCityUser")
-    public ResponseBean selectCityUser() {
-        return iStatisticalService.selectCityUser();
+    public ResponseBean selectCityUser(HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
+        return iStatisticalService.selectCityUser(orgId);
     }
 
     /**
@@ -149,8 +158,9 @@ public class StatisticalController {
     @GetMapping(value = "/admin/selectIntentionUser")
     public ResponseBean selectIntentionUser(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                             @RequestParam(value = "pageSize", defaultValue = "2") Integer pageSize,
-                                            @RequestParam(value = "buildingId", required = false) String buildingId) {
-        return iStatisticalService.selectIntentionUser(pageNum, pageSize, buildingId);
+                                            @RequestParam(value = "buildingId", required = false) String buildingId,
+                                            HttpServletRequest request) {
+        return iStatisticalService.selectIntentionUser(pageNum, pageSize, getOrgId(request), buildingId);
     }
 
 }

src/main/java/com/huiju/estateagents/controller/SysButtonInMenuController.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.SysButtonInMenu;
+import com.huiju.estateagents.service.ISysButtonInMenuService;
+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 2019-09-11
+ */
+@RestController
+@RequestMapping("/")
+public class SysButtonInMenuController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysButtonInMenuController.class);
+
+    @Autowired
+    public ISysButtonInMenuService iSysButtonInMenuService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/sysButtonInMenu",method= RequestMethod.GET)
+    public ResponseBean sysButtonInMenuList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<SysButtonInMenu> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<SysButtonInMenu> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<SysButtonInMenu> result = iSysButtonInMenuService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysButtonInMenuList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param sysButtonInMenu 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysButtonInMenu",method= RequestMethod.POST)
+    public ResponseBean sysButtonInMenuAdd(@RequestBody SysButtonInMenu sysButtonInMenu){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysButtonInMenuService.save(sysButtonInMenu)){
+                responseBean.addSuccess(sysButtonInMenu);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysButtonInMenuAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/sysButtonInMenu/{id}", method= RequestMethod.DELETE)
+    public ResponseBean sysButtonInMenuDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iSysButtonInMenuService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysButtonInMenuDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param sysButtonInMenu 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysButtonInMenu/{id}",method= RequestMethod.PUT)
+    public ResponseBean sysButtonInMenuUpdate(@PathVariable Integer id,
+                                        @RequestBody SysButtonInMenu sysButtonInMenu){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysButtonInMenuService.updateById(sysButtonInMenu)){
+                responseBean.addSuccess(sysButtonInMenu);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysButtonInMenuUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/sysButtonInMenu/{id}",method= RequestMethod.GET)
+    public ResponseBean sysButtonInMenuGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iSysButtonInMenuService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysButtonInMenuDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,174 @@
+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.common.JWTUtils;
+import com.huiju.estateagents.entity.SysMenu;
+import com.huiju.estateagents.service.ISysMenuService;
+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.lang.reflect.Array;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+    * 菜单表 不同系统,菜单不一致 前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@RestController
+@RequestMapping("/api")
+public class SysMenuController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysMenuController.class);
+
+    @Autowired
+    public ISysMenuService iSysMenuService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/sysMenu",method= RequestMethod.GET)
+    public ResponseBean sysMenuList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<SysMenu> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<SysMenu> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<SysMenu> result = iSysMenuService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysMenuList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param sysMenu 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysMenu",method= RequestMethod.POST)
+    public ResponseBean sysMenuAdd(@RequestBody SysMenu sysMenu){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysMenuService.save(sysMenu)){
+                responseBean.addSuccess(sysMenu);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysMenuAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/sysMenu/{id}", method= RequestMethod.DELETE)
+    public ResponseBean sysMenuDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iSysMenuService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysMenuDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param sysMenu 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysMenu/{id}",method= RequestMethod.PUT)
+    public ResponseBean sysMenuUpdate(@PathVariable Integer id,
+                                        @RequestBody SysMenu sysMenu){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSysMenuService.updateById(sysMenu)){
+                responseBean.addSuccess(sysMenu);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysMenuUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/sysMenu/{id}",method= RequestMethod.GET)
+    public ResponseBean sysMenuGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iSysMenuService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysMenuDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 获取所有模块
+     * @return
+     */
+    @GetMapping(value = "/center/sysmodules")
+    public ResponseBean allModules(@RequestParam Integer userId) {
+        List<SysMenu> sysMenuList = iSysMenuService.getAllModules(userId);
+        return ResponseBean.success(sysMenuList);
+    }
+
+    @PostMapping(value = "/center/sysmodules")
+    public ResponseBean authorizeModules(@RequestBody Map<String, Object> data) {
+
+        Integer userId = (Integer) data.get("userId");
+        List<Integer> menuIds = (List<Integer>) data.get("menus");
+
+        try {
+            iSysMenuService.authorizeModules(userId, menuIds);
+        } catch (Exception e) {
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        return ResponseBean.success("ok");
+    }
+}

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

@@ -11,6 +11,10 @@ import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaSaveService;
 import com.huiju.estateagents.service.ITdCityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -23,6 +27,7 @@ import javax.servlet.http.HttpSession;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -34,6 +39,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "楼盘")
 public class TaBuildingController extends BaseController {
 
     @Autowired
@@ -52,29 +58,46 @@ public class TaBuildingController extends BaseController {
      * @return
      */
     @GetMapping("/admin/buildingSelectId/{id}")
+    @ApiOperation(value = "项目详情", notes = "项目详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "id", value = "项目id")
+    })
     public ResponseBean buildingSelectId(@PathVariable(value = "id") String id){
         return taBuildingService.buildingSelectId(id);
     }
 
     /**
-     * 楼盘列表
+     * 楼盘列表 查询所有有效的
      * @param pageNum
      * @param pageSize
      * @param name
      * @param code
      * @return
      */
+    @ApiOperation(value = "项目列表 查询所有有效的", notes = "项目列表 查询所有有效的")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "pageNum", value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "pageSize", value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "name", value = "项目名称"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "code", value = "项目编号"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "startDate", value = "开盘时间"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "buildingStatus", value = "项目状态"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "marketStatus", value = "销售状态"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "cityId", value = "城市Id"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "isMain", value = "是否主推项目"),
+    })
     @GetMapping("/admin/buildinglist")
     public ResponseBean buildingList(@RequestParam(value = "pageNum", defaultValue = "1")Integer pageNum,
                                      @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
                                      @RequestParam(value = "name", required = false)String name,
                                      @RequestParam(value = "code", required = false)String code,
-                                     @RequestParam(value = "startDate",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)LocalDateTime startDate,
+                                     @RequestParam(value = "startDate",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startDate,
                                      @RequestParam(value = "buildingStatus",required = false)String buildingStatus,
                                      @RequestParam(value = "marketStatus",required = false)String marketStatus,
                                      @RequestParam(value = "cityId",required = false)Integer cityId,
-                                     @RequestParam(value = "isMain",required = false)Integer isMain){
-        return taBuildingService.buildingList(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain);
+                                     @RequestParam(value = "isMain",required = false)Integer isMain,
+                                     HttpServletRequest request){
+        return taBuildingService.buildingList(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain, getOrgId(request));
     }
 
     /**
@@ -85,6 +108,18 @@ public class TaBuildingController extends BaseController {
      * @param code
      * @return
      */
+    @ApiOperation(value = "项目列表", notes = "项目列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "pageNum", value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "pageSize", value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "name", value = "项目名称"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "code", value = "项目编号"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "startDate", value = "开盘时间"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "buildingStatus", value = "项目状态"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "marketStatus", value = "销售状态"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "cityId", value = "城市Id"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "isMain", value = "是否主推项目"),
+    })
     @GetMapping("/admin/buildinglist/select")
     public ResponseBean buildingListSelect(@RequestParam(value = "pageNum", defaultValue = "1")Integer pageNum,
                                      @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
@@ -94,8 +129,9 @@ public class TaBuildingController extends BaseController {
                                      @RequestParam(value = "buildingStatus",required = false)String buildingStatus,
                                      @RequestParam(value = "marketStatus",required = false)String marketStatus,
                                      @RequestParam(value = "cityId",required = false)Integer cityId,
-                                     @RequestParam(value = "isMain",required = false)Integer isMain){
-        return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain);
+                                     @RequestParam(value = "isMain",required = false)Integer isMain,
+                                           HttpServletRequest request){
+        return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain,getOrgId(request));
     }
 
     /**
@@ -103,9 +139,13 @@ public class TaBuildingController extends BaseController {
      * @param parameter
      * @return
      */
+    @ApiOperation(value = "更新项目", notes = "更新项目")
+    @ApiImplicitParams({
+
+    })
     @PutMapping("/admin/building/update")
-    public ResponseBean buildingUpdate(@RequestBody String parameter){
-        return taBuildingService.buildingUpdate(parameter);
+    public ResponseBean buildingUpdate(@RequestBody String parameter, HttpServletRequest request){
+        return taBuildingService.buildingUpdate(parameter, getOrgId(request));
     }
 
     /**
@@ -113,30 +153,42 @@ public class TaBuildingController extends BaseController {
      * @param parameter
      * @return
      */
+    @ApiOperation(value = "项目添加", notes = "项目添加")
+    @ApiImplicitParams({
+
+    })
     @RequestMapping(value = "/admin/building/add", method = RequestMethod.POST)
-    public ResponseBean buildingAdd(@RequestBody String parameter){
-        return taBuildingService.buildingAdd(parameter);
+    public ResponseBean buildingAdd(@RequestBody String parameter, HttpServletRequest request){
+        return taBuildingService.buildingAdd(parameter, getOrgId(request));
     }
 
     /**
-     * 楼盘发布
+     * 楼盘getPersonId(request);
      * @param parameter
      * @return
      */
+    @ApiOperation(value = "项目发布", notes = "项目发布")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "status：状态，id：项目id"),
+    })
     @RequestMapping(value = "/admin/building/update/status", method = RequestMethod.PUT)
-    public ResponseBean buildingUpdateStatus(@RequestBody String parameter){
-        return taBuildingService.buildingUpdateStatus(parameter);
+    public ResponseBean buildingUpdateStatus(@RequestBody String parameter, HttpServletRequest request){
+        return taBuildingService.buildingUpdateStatus(parameter, getOrgId(request));
     }
 
     /**
      * 楼盘删除
      * @param id
-     * @param session
+     * @param request
      * @return
      */
+    @ApiOperation(value = "项目发布", notes = "项目发布")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "id", value = "项目id"),
+    })
     @RequestMapping(value = "/admin/building/delete/{id}", method = RequestMethod.DELETE)
-    public ResponseBean buildingdelete(@PathVariable("id") String id, HttpSession session){
-        return taBuildingService.buildingdelete(id);
+    public ResponseBean buildingdelete(@PathVariable("id") String id, HttpServletRequest request){
+        return taBuildingService.buildingdelete(id, getOrgId(request));
     }
 
     /**
@@ -145,6 +197,7 @@ public class TaBuildingController extends BaseController {
      * @param session
      * @return
      */
+    @ApiOperation(value = "添加户型", notes = "添加户型")
     @RequestMapping(value = "/admin/buildingApartment/add", method = RequestMethod.POST)
     public ResponseBean buildingApartment(@RequestBody String parameter, HttpSession session){
         return taBuildingService.buildingApartmentAdd(parameter);
@@ -155,16 +208,21 @@ public class TaBuildingController extends BaseController {
      * @param parameter
      * @return
      */
+    @ApiOperation(value = "户型编辑", notes = "户型编辑")
     @RequestMapping(value = "/admin/buildingApartment/update", method = RequestMethod.PUT)
     public ResponseBean buildingApartmentUpdate(@RequestBody String parameter){
         return taBuildingService.buildingApartmentUpdate(parameter);
     }
 
     /**
-     * 楼盘详情
+     * 户型详情
      * @param id
      * @return
      */
+    @ApiOperation(value = "户型详情", notes = "户型详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "id", value = "户型id"),
+    })
     @RequestMapping(value = "/admin/buildingApartment/{id}", method = RequestMethod.GET)
     public ResponseBean buildingApartmentSelectId(@PathVariable(value = "id") String id){
         return taBuildingService.buildingApartmentSelectId(id);
@@ -175,9 +233,15 @@ public class TaBuildingController extends BaseController {
      * @param id
      * @return
      */
+    @ApiOperation(value = "依据项目ID 查户型", notes = "依据项目ID 查户型")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "id", value = "项目ID"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "apartmentType", value = "类型"),
+    })
     @RequestMapping(value = "/admin/buildingApartment/buildingId/{id}", method = RequestMethod.GET)
-    public ResponseBean buildingApartmentBuildingId(@PathVariable(value = "id") String id){
-        return taBuildingService.buildingApartmentBuildingId(id);
+    public ResponseBean buildingApartmentBuildingId(@PathVariable(value = "id") String id,
+                                                    @RequestParam(value = "apartmentType", required = false) String apartmentType){
+        return taBuildingService.buildingApartmentBuildingId(id, apartmentType);
     }
 
     /**
@@ -186,7 +250,7 @@ public class TaBuildingController extends BaseController {
      */
     @RequestMapping(value = "/wx/building/list", method = RequestMethod.GET)
     public ResponseBean getWxBuildingList(
-            @RequestParam(defaultValue = "1") Integer pageNum,
+            @RequestParam(defaultValue = "1") Integer pageNumber,
             @RequestParam(defaultValue = "10")Integer pageSize,
             @RequestParam(defaultValue = "false") Boolean mine,
             @RequestParam(required = false) Integer cityId,
@@ -201,9 +265,10 @@ public class TaBuildingController extends BaseController {
 //            @RequestParam(required = false) Double maxBuildingArea, // 最大面积
             HttpServletRequest request
     ){
+        Integer orgId = getOrgId(request);
         List<String> targets = null;
         if (null != mine && mine) {
-            String openid = JWTUtils.getSubject(request);
+            String openid = getOpenId(request);
             List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
             if (null == persons || persons.size() == 0) {
                 return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -217,7 +282,7 @@ public class TaBuildingController extends BaseController {
         List<String[]> priceList = getParamListOf(price);
         List<String[]> areaList = getParamListOf(area);
 
-        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets, cityId,mine, houseTypeList, buildingTypeList, priceList, areaList);
+        return taBuildingService.getWxBuildingList(pageNumber, pageSize, name, targets, cityId,mine, houseTypeList, buildingTypeList, priceList, areaList,orgId);
     }
 
 
@@ -268,20 +333,21 @@ public class TaBuildingController extends BaseController {
      */
     @RequestMapping(value = "/wx/buildingSelectId/{id}", method = RequestMethod.GET)
     public ResponseBean wxBuildingSelectId(@PathVariable(value = "id") String id,HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
         List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
         if (null == persons || persons.size() == 0) {
             return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = persons.get(0);
-        return taBuildingService.buildingAllSelectId(id,person.getPersonId());
+        return taBuildingService.buildingAllSelectId(id,person.getPersonId(), orgId);
     }
     /**
      * 查询当前所有项目
      */
     @RequestMapping(value = "/admin/buildingAll", method = RequestMethod.GET)
-    public  ResponseBean buildingAll(){
-        ResponseBean taBuilding= taBuildingService.buildingAll();
+    public  ResponseBean buildingAll(HttpServletRequest request){
+        ResponseBean taBuilding= taBuildingService.buildingAll(getOrgId(request));
         return taBuilding;
     }
 }

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

@@ -1,6 +1,9 @@
 package com.huiju.estateagents.controller;
 
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,21 +14,28 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
-import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
-import com.huiju.estateagents.mapper.TaBuildingMapper;
-import com.huiju.estateagents.service.ITaBuildingDynamicService;
-import com.huiju.estateagents.service.ITaBuildingService;
-import com.huiju.estateagents.service.ITaPersonService;
-import com.huiju.estateagents.service.ITaSaveService;
+import com.huiju.estateagents.event.EventBus;
+import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
+import com.huiju.estateagents.excel.TaActivityDynamicEnlistExport;
+import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
+import com.huiju.estateagents.mapper.*;
+import com.huiju.estateagents.service.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
+import org.springframework.context.ApplicationContext;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.ServletRequestDataBinder;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import javax.swing.*;
+import java.io.IOException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -33,6 +43,9 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
+import static com.huiju.estateagents.event.EventBus.EventType.ActivityCheckin;
 
 /**
  * <p>
@@ -44,6 +57,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "项目活动", tags = "项目活动")
 public class TaBuildingDynamicController extends BaseController {
 
     @Autowired
@@ -61,22 +75,58 @@ public class TaBuildingDynamicController extends BaseController {
     @Autowired
     private ITaBuildingService iTaBuildingService;
 
+    @Autowired
+    private ITaRecommendCustomerService recommendCustomerService;
+
+    @Autowired
+    private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
+
+    @Autowired
+    private TaSharePersonFromMapper taSharePersonFromMapper;
+
+    @Autowired
+    private ApplicationContext applicationContext;
+
+    @Autowired
+    private IMiniAppService miniAppService;
+
+    @Autowired
+    private TaMiniappMapper taMiniappMapper;
+
+    @Autowired
+    private TaMiniappQrcodeMapper taMiniappQrcodeMapper;
+    
+    @Autowired
+    private ITaPointsRecordsService taPointsRecordsService;
+
     @InitBinder
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
         CustomDateEditor editor = new CustomDateEditor(df, true);//true表示允许为空，false反之
         binder.registerCustomEditor(Date.class, editor);
     }
-
+    
+    @ApiOperation(value = "后台管理端查询项目活动列表", notes = "后台管理端查询项目活动列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "name", paramType = "query",value = "项目名称"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "cityId", paramType = "query",value = "城市id"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "title", paramType = "query",value = "标题"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "isEnlist", paramType = "query",value = "是否报名"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "time", paramType = "query",value = "日期")
+    })
     @RequestMapping(value = "/admin/iBuildingDynamicList", method = RequestMethod.GET)
     public ResponseBean iBuildingDynamicList(@RequestParam("pageNum")Integer pageNum,
                                              @RequestParam("pageSize")Integer pageSize,
                                              @RequestParam(required = false)String name,
                                              @RequestParam(required = false)Integer cityId,
                                              @RequestParam(required = false)String buildingId,
+                                             @RequestParam(required = false)String title,
                                              @RequestParam(required = false)String isEnlist,
-                                             @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime time){
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time);
+                                             @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime time,HttpServletRequest request){
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title,getOrgId(request));
         return responseBean;
     }
 
@@ -88,19 +138,28 @@ public class TaBuildingDynamicController extends BaseController {
 
     /**
      * 活动列表
-     * @param pageNum
+     * @param pageNumber
      * @param pageSize
      * @param request
      * @return
      */
+    @ApiOperation(value = "微信端查询项目活动列表", notes = "微信端查询项目活动列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "cityId", paramType = "query",value = "城市id"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id"),
+            @ApiImplicitParam(dataTypeClass = Boolean.class, name = "mine", paramType = "query")
+    })
     @RequestMapping(value = "/wx/buildingDynamiceList", method = RequestMethod.GET)
     public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId", required = false)String buildingId,
-                                               @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
+                                               @RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
                                                @RequestParam(defaultValue = "false" )boolean mine,
                                                @RequestParam(value = "cityId", required = false)Integer cityId,
                                                HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
         ResponseBean  responseBean = new ResponseBean();
         if(mine){
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
@@ -108,27 +167,26 @@ public class TaBuildingDynamicController extends BaseController {
                 return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
             }
             TaPerson person = taPersons.get(0);
-            responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNum,pageSize,"",person));
+            responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNumber,pageSize,"",person,orgId));
         }else {
-            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid,cityId);
+            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNumber,pageSize,buildingId,openid,cityId,orgId);
         }
 
         return responseBean;
     }
-
-    /**
-     * 活动列表
-     * @param pageNum
-     * @param pageSize
-     * @param request
-     * @return
-     */
+    
+    @ApiOperation(value = "微信端查询收藏项目活动列表", notes = "微信端查询收藏项目活动列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id")
+    })
     @RequestMapping(value = "/wx/save/buildingDynamiceList", method = RequestMethod.GET)
     public ResponseBean wxSaveBuildingDynamiceList(@RequestParam(value = "buildingId", required = false)String buildingId,
-                                               @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
+                                               @RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
                                                HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         ResponseBean  responseBean = new ResponseBean();
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
             if (null == taPersons || taPersons.size() != 1) {
@@ -144,12 +202,27 @@ public class TaBuildingDynamicController extends BaseController {
                 for(int i = 0; i<saveList.size();i++){
                     ids.add(saveList.get(i).getSavedTarget());
                 }
-                IPage<TaBuildingDynamic> page = new Page<>(pageNum, pageSize);
+                IPage<TaBuildingDynamic> page = new Page<>(pageNumber, pageSize);
                 QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
                 buildingDynamicQueryWrapper.in("dynamic_id",ids);
                 IPage<TaBuildingDynamic> buildingDynamicIPage = iBuildingDynamicService.page(page,buildingDynamicQueryWrapper);
+    
+                //查询是否报名了普通活动
+                QueryWrapper<TaActivityDynamicEnlist> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("org_id",getOrgId(request));
+                queryWrapper.eq("person_id",person.getPersonId());
+                List<TaActivityDynamicEnlist> taActivityDynamicEnlists = taActivityDynamicEnlistMapper.selectList(queryWrapper);
+                
                 for(int j=0;j<buildingDynamicIPage.getRecords().size();j++){
                     iBuildingDynamicService.setExtendInfo(buildingDynamicIPage.getRecords().get(j),person);
+                    
+                    //是否已参与状态
+                    TaBuildingDynamic taBuildingDynamic = buildingDynamicIPage.getRecords().get(j);
+                    taActivityDynamicEnlists.forEach(dynamic -> {
+                        if (taBuildingDynamic.getDynamicId().equals(dynamic.getDynamicId())){
+                            taBuildingDynamic.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
+                        }
+                    });
                 }
                 responseBean.addSuccess(buildingDynamicIPage);
             }else {
@@ -165,12 +238,104 @@ public class TaBuildingDynamicController extends BaseController {
      * @param dynamicId
      * @return
      */
+    @ApiOperation(value = "微信端查询活动详情", notes = "微信端查询活动详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, name = "dynamicId", paramType = "path",value = "活动ID")
+    })
     @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
     public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
                                              HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
         String buildingId = "";
-        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId,buildingId,openid);
+        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId,buildingId,openid, orgId);
+        return responseBean;
+    }
+
+    /**
+     * 活动详情
+     * @param dynamicId
+     * @return
+     */
+    @ApiOperation(value = "微信端查询活报名动详情", notes = "微信端查询活报名动详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, name = "dynamicId", paramType = "path",value = "活动ID")
+    })
+    @RequestMapping(value = "/wx/buildingDynamiceEnlistInfo/{dynamicId}", method = RequestMethod.GET)
+    public ResponseBean iBuildingDynamicEnlistInfo(@PathVariable(value = "dynamicId") String dynamicId,
+                                             HttpServletRequest request){
+        ResponseBean  responseBean = new ResponseBean();
+                String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        Integer orgId = getOrgId(request);
+        QueryWrapper<TaActivityDynamicEnlist>enlistQueryWrapper = new QueryWrapper<>();
+        enlistQueryWrapper.eq("dynamic_id",dynamicId);
+        enlistQueryWrapper.eq("person_id",person.getPersonId());
+        enlistQueryWrapper.eq("org_id",orgId);
+        List <TaActivityDynamicEnlist> enlists = taActivityDynamicEnlistMapper.selectList(enlistQueryWrapper);
+        TaBuildingDynamic buildingDynamic = iBuildingDynamicService.getById(dynamicId);
+        Map<String,Object>data = new HashMap<>();
+        TaActivityDynamicEnlist enlist = new TaActivityDynamicEnlist();
+        if(enlists.size()>0){
+            enlist = enlists.get(0);
+        }
+        data.put("enlist",enlist);
+        data.put("dynamic",buildingDynamic);
+        data.put("person",person);
+        responseBean.addSuccess(data);
+        return responseBean;
+    }
+
+
+    /**
+     * 活动签到
+     * @param enlistId
+     * @return
+     */
+    @ApiOperation(value = "微信端活动签到", notes = "微信端活动签到")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "enlistId", paramType = "path",value = "活动报名ID")
+    })
+    @RequestMapping(value = "/wx/buildingDynamicCheckin/{enlistId}", method = RequestMethod.PUT)
+    public ResponseBean iBuildingDynamicCheckin(@PathVariable(value = "enlistId") String enlistId,
+                                             HttpServletRequest request){
+        ResponseBean  responseBean =new ResponseBean();
+       TaActivityDynamicEnlist enlist = taActivityDynamicEnlistMapper.selectById(enlistId);
+       try{
+           if(null != enlist){
+               Integer tempIsCheckin = enlist.getIsCheckin();
+               enlist.setIsCheckin(CommConstant.STATUS_NORMAL);
+               if(taActivityDynamicEnlistMapper.updateById(enlist)>0){
+                   if (tempIsCheckin.intValue() == CommConstant.STATUS_UNACCALIMED.intValue()){
+                       enlist.setEnlistId(Integer.valueOf(enlistId));
+                       applicationContext.publishEvent(new EventBus(enlist,ActivityCheckin,getOrgId(request)));
+                       QueryWrapper<TaRecommendCustomer> customerQueryWrapper = new QueryWrapper<>();
+                       customerQueryWrapper.eq("person_id",enlist.getPersonId());
+                       customerQueryWrapper.eq("building_id",enlist.getBuildingId());
+                       TaRecommendCustomer recommendCustomer = recommendCustomerService.getOne(customerQueryWrapper);
+                       if (recommendCustomer.getStatus() < CommConstant.CUSTOMER_VISITE){
+                           recommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
+                           recommendCustomer.setArrivalDate(LocalDateTime.now());
+                           recommendCustomerService.updateById(recommendCustomer);
+                       }
+                       Integer rulePoints = taPointsRecordsService.getRulePoints(CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN, getOrgId(request));
+                       enlist.setAddPoints(rulePoints);
+                       responseBean.addSuccess(enlist);
+                   }else {
+                       responseBean.addError("您已签到过");
+                   }
+               }else {
+                   responseBean.addError("签到失败");
+               }
+           }
+       }catch (Exception e){
+           e.printStackTrace();
+           responseBean.addError("签到异常");
+       }
         return responseBean;
     }
 
@@ -180,52 +345,141 @@ public class TaBuildingDynamicController extends BaseController {
      * @param request
      * @return
      */
+    @ApiOperation(value = "微信端添加活动报名", notes = "微信端添加活动报名")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "TaActivityDynamicEnlist", name = "taActivityDynamicEnlist", paramType = "body",value = "")
+    })
     @RequestMapping(value = "/wx/activityDynamicEnlistAdd", method = RequestMethod.POST)
     public ResponseBean taActivityDynamicEnlist(@RequestBody TaActivityDynamicEnlist taActivityDynamicEnlist,
                                                 HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
+        TaBuildingDynamic buildingDynamic = iBuildingDynamicService.getById(taActivityDynamicEnlist.getDynamicId());
+        // TODO 看代码里面是 is_enlist = 1 才是允许报名
+        if (buildingDynamic.getIsEnlist().intValue() != 1) {
+            return ResponseBean.error("活动不允许报名", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        // 携带的报名人数(是已经包括自己了)，不能超过活动总人数
+
+        // 检验 个人最大报名人数
+        if (taActivityDynamicEnlist.getAttendNum() > buildingDynamic.getMaxEnlistByPerson().intValue()) {
+            return ResponseBean.error("报名失败，超过活动报名的个人最大报名人数！", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        // 当前活动已报名的总人数
+        Integer enlistCount = taActivityDynamicEnlistMapper.selectEnlistCount(taActivityDynamicEnlist.getDynamicId(), orgId);
+        if ((enlistCount + taActivityDynamicEnlist.getAttendNum()) > buildingDynamic.getPersonNum().intValue()) {
+            return ResponseBean.error("报名失败，超过活动报名的最大人数！", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
         TaPerson person = taPersons.get(0);
+
+        // 反向更新TaSharePersonFrom 的 status
+        QueryWrapper<TaSharePersonFrom> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("target_id", taActivityDynamicEnlist.getDynamicId());
+        queryWrapper.eq("target_type", "dynamic_share");
+        queryWrapper.eq("person_id", person.getPersonId());
+        queryWrapper.orderByDesc("create_date");
+        queryWrapper.last("limit 1");
+        TaSharePersonFrom taSharePersonFrom = taSharePersonFromMapper.selectOne(queryWrapper);
+        if (null != taSharePersonFrom) {
+            taSharePersonFrom.setStatus(1);
+            taSharePersonFromMapper.updateById(taSharePersonFrom);
+        }
+
         taActivityDynamicEnlist.setPersonId(person.getPersonId());
-        ResponseBean  responseBean = iBuildingDynamicService.taActivityDynamicEnlistAdd(taActivityDynamicEnlist);
+        taActivityDynamicEnlist.setOrgId(orgId);
+        taActivityDynamicEnlist.setIsCheckin(CommConstant.STATUS_UNACCALIMED);
+        ResponseBean  responseBean = iBuildingDynamicService.taActivityDynamicEnlistAdd(taActivityDynamicEnlist, orgId);
         return responseBean;
     }
-
-
+    
+    
+    @ApiOperation(value = "后端活动添加", notes = "后端活动添加")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "TaBuildingDynamic", name = "parameter", paramType = "body",value = "活动详细信息")
+    })
     @RequestMapping(value = "/admin/buildingDynamic/add" ,method =RequestMethod.POST)
-    public  ResponseBean buildingDynamicAdd(@RequestBody String parameter){
+    public  ResponseBean buildingDynamicAdd(@RequestBody String parameter,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
+        dynamic.setOrgId(getOrgId(request));
         Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
         dynamic.setCityId(cityId);
+        //发布状态 1展示
         dynamic.setStatus(1);
-//        dynamic.setDynamicId(idGen.nextId()+"");
+        //活动状态，如果不需要报名则直接置为进行中
+        dynamic.setActivityStatus(1);
+        //3.5.1版本去除是否需要报名
+//        if (dynamic.getIsEnlist() == 0){
+//            dynamic.setActivityStatus(0);
+//        }
         dynamic.setPublishDate(LocalDateTime.now());
         dynamic.setCreateDate(LocalDateTime.now());
+
+        Integer heavyCount = iTaBuildingService.countNumByHeavy(dynamic.getHeavy());
+        if (heavyCount != 0){
+            responseBean.addError("权重已存在，请重新编辑");
+            return responseBean;
+        }
+         // 根据ORGID查询当前小程序表的miniapp_id
+        QueryWrapper<TaMiniapp> taMiniappQuery= new QueryWrapper<>();
+        taMiniappQuery.eq("org_id",getOrgId(request));
+        TaMiniapp taMiniapp = taMiniappMapper.selectOne(taMiniappQuery);
         iBuildingDynamicService.save(dynamic);
+        // 生成二维码
+        ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.ACTIVITY_QRCODE.replace("#0",dynamic.getDynamicId()).replace("#1","activity"),taMiniapp.getMiniappId());
+        dynamic.setQrCode(String.valueOf(taMiniappQrcode.getData()));
+        iBuildingDynamicService.updateById(dynamic);
+        responseBean.addSuccess(dynamic);
         return responseBean;
     }
-
+    
+    @ApiOperation(value = "后端活动更新", notes = "后端微信活动更新")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "TaBuildingDynamic", name = "parameter", paramType = "body",value = "活动详细信息")
+    })
     @RequestMapping(value = "/admin/buildingDynamic/update" ,method =RequestMethod.PUT)
-    public  ResponseBean buildingDynamicUpdate(@RequestBody String parameter){
+    public  ResponseBean buildingDynamicUpdate(@RequestBody String parameter,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
+        dynamic.setOrgId(getOrgId(request));
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
         Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
         dynamic.setCityId(cityId);
+        if (dynamic.getEnlistStart() != null && LocalDateTime.now().isBefore(dynamic.getEnlistStart())){
+            dynamic.setActivityStatus(1);
+        }
+        if (dynamic.getEnlistEnd() != null && LocalDateTime.now().isAfter(dynamic.getEnlistEnd())){
+            dynamic.setActivityStatus(2);
+        }
+        Integer heavyCount = iTaBuildingService.countNumByHeavy(dynamic.getHeavy());
+        if (heavyCount != 0){
+            responseBean.addError("权重已存在，请重新编辑");
+            return responseBean;
+        }
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamic.getDynamicId());
         iBuildingDynamicService.update(dynamic, buildingDynamicQueryWrapper);
         return responseBean;
     }
-
+    
+    @ApiOperation(value = "后端置顶", notes = "后端置顶")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "String", name = "dynamicId", paramType = "query",value = "活动ID"),
+            @ApiImplicitParam(dataType = "Integer", name = "weight", paramType = "query",value = "权重")
+    })
     @RequestMapping(value = "/admin/buildingDynamic/weight" ,method =RequestMethod.PUT)
-    public  ResponseBean buildingDynamicWeight(@RequestParam String dynamicId,@RequestParam Integer weight){
+    public  ResponseBean buildingDynamicWeight(@RequestParam String dynamicId,@RequestParam Integer weight,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         TaBuildingDynamic dynamic = iBuildingDynamicService.getById(dynamicId);
         dynamic.setWeight(weight);
+        dynamic.setOrgId(getOrgId(request));
         QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
         dynamicQueryWrapper.eq("dynamic_id",dynamic);
         if (iBuildingDynamicService.updateById(dynamic)){
@@ -235,37 +489,55 @@ public class TaBuildingDynamicController extends BaseController {
         }
         return responseBean;
     }
-
+    
+    
+    @ApiOperation(value = "后端删除", notes = "后端删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "String", name = "id", paramType = "query",value = "活动ID")
+    })
     @RequestMapping(value = "/admin/buildingDynamic/delete", method = RequestMethod.DELETE)
     public ResponseBean buildingDynamicdelect(@RequestParam(value = "id",required = false)String id) {
         ResponseBean responseBean = iBuildingDynamicService.buildingDynamicDelete(id);
         return responseBean;
     }
-
-
+    
+    @ApiOperation(value = "后端发布活动", notes = "后端发布活动")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "String", name = "dynamicId", paramType = "path",value = "活动ID")
+    })
     @RequestMapping(value = "/admin/buildingDynamic/send/{dynamicId}", method = RequestMethod.PUT)
-    public ResponseBean send(@PathVariable String dynamicId) {
+    public ResponseBean send(@PathVariable String dynamicId, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
         dynamicQueryWrapper.eq("dynamic_id", dynamicId);
         TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
         dynamic.setStatus(1);
         dynamic.setPublishDate(LocalDateTime.now());
+        dynamic.setOrgId(getOrgId(request));
         iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
         return responseBean;
     }
-
+    
+    @ApiOperation(value = "后端取消活动", notes = "后端取消活动")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "String", name = "dynamicId", paramType = "path",value = "活动ID")
+    })
     @RequestMapping(value = "/admin/buildingDynamic/cancel/{dynamicId}", method = RequestMethod.PUT)
-    public ResponseBean cancel(@PathVariable String dynamicId) {
+    public ResponseBean cancel(@PathVariable String dynamicId, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
         dynamicQueryWrapper.eq("dynamic_id", dynamicId);
         TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
         dynamic.setStatus(0);
+        dynamic.setOrgId(getOrgId(request));
         iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
         return responseBean;
     }
-
+    
+    @ApiOperation(value = "后端活动详情", notes = "后端活动详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "String", name = "dynamicId", paramType = "query",value = "活动ID")
+    })
     @RequestMapping(value = "/admin/buildingDynamic/Details", method = RequestMethod.GET)
     public ResponseBean buildingDynamicDetails(@RequestParam("dynamicId")String dynamicId) {
         ResponseBean responseBean = new ResponseBean();
@@ -281,15 +553,28 @@ public class TaBuildingDynamicController extends BaseController {
         responseBean.addSuccess(dynamic);
         return responseBean;
     }
-
+    
+    @ApiOperation(value = "后端报名列表", notes = "后端报名列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataType = "String", name = "dynamicId", paramType = "query",value = "活动ID"),
+            @ApiImplicitParam(dataType = "String", name = "isCheckin", paramType = "query",value = "0未签到1签到"),
+            @ApiImplicitParam(dataType = "String", name = "name", paramType = "query",value = "用户姓名"),
+            @ApiImplicitParam(dataType = "String", name = "phone", paramType = "query",value = "手机号")
+    })
     @RequestMapping(value = "/admin/SignList", method = RequestMethod.GET)
     public ResponseBean getSignList(@RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
                                     @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
-                                    @RequestParam(value = "dynamicId",required = false)String dynamicId) {
+                                    @RequestParam(value = "dynamicId",required = false)String dynamicId,
+                                    @RequestParam(value = "isCheckin",required = false)String isCheckin,
+                                    @RequestParam(value = "name",required = false)String name,
+                                    @RequestParam(value = "phone",required = false)String phone,
+                                    HttpServletRequest request) {
         Page<TaActivityDynamicEnlist> page = new Page<>();
         page.setSize(pageSize);
         page.setCurrent(pageNum);
-        ResponseBean signList = iBuildingDynamicService.signList(page,dynamicId);
+        ResponseBean signList = iBuildingDynamicService.signList(page,dynamicId, getOrgId(request),isCheckin,name,phone);
 
         HashMap<String, Object> map = new HashMap<>();
         map.put("list", signList);
@@ -298,7 +583,11 @@ public class TaBuildingDynamicController extends BaseController {
         map.put("pageSize", page.getSize());
         return ResponseBean.success(map);
     }
-
+    
+    @ApiOperation(value = "后端结束活动", notes = "后端结束活动")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "String", name = "parameter", paramType = "body",value = "活动ID dynamicId 和 top")
+    })
     @RequestMapping(value = "/admin/buildingDynamic/finish" ,method =RequestMethod.PUT)
     public  ResponseBean buildingDynamicFinish(@RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
@@ -311,13 +600,56 @@ public class TaBuildingDynamicController extends BaseController {
         if ("1".equals(top)) {
             dynamic.setCreateDate(LocalDateTime.now());
         } else {
-            dynamic.setIsEnlist("2");
+            dynamic.setActivityStatus(2);
         }
         iBuildingDynamicService.update(dynamic, taBuildingDynamic);
         responseBean.addSuccess("成功");
         return responseBean;
     }
 
+    /**
+     * 报名记录导出
+     *
+     * @param request
+     * @param response
+     * @throws IOException
+     */
+    @GetMapping("/admin/activityDynamicEnlist/export")
+    public void activityDynamicEnlistExport(HttpServletRequest request,
+                                      HttpServletResponse response,
+                                      @RequestParam(value = "dynamicId",required = false)String dynamicId,
+                                      @RequestParam(value = "isCheckin",required = false)String isCheckin,
+                                      @RequestParam(value = "name",required = false)String name,
+                                      @RequestParam(value = "phone",required = false)String phone) throws IOException {
+        //        response.setContentType("application/vnd.ms-excel");
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=助力活动发起人.xlsx");
+
+        Integer orgId = getOrgId(request);
+
+        Integer pageCode = 0;
+        Integer pageSize = 100;
+        // 总页数
+        Integer pageCount = 0;
+
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), TaActivityDynamicEnlistExport.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("报名记录").build();
+            Integer count = iBuildingDynamicService.getTaActivityDynamicEnlist(dynamicId,isCheckin,name,phone);
+            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+            List<HelpInitiateRecordSucceed> publicList = null;
+            do {
+                publicList = iBuildingDynamicService.getTaActivityDynamicEnlistExport(pageCode * pageSize, pageSize,dynamicId,isCheckin,name,phone,getOrgId(request));
+                excelWriter.write(publicList, writeSheet);
+
+                pageCode++;
+            } while (pageCode <= pageCount);
+
+            // finish 会帮忙关闭流
+            excelWriter.finish();
+        }
+
 
 
 }

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

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import com.huiju.estateagents.base.BaseController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -92,9 +93,9 @@ public class TaBuildingIntentionController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/taBuildingIntentionAddOrUpdate/{buildingId}",method= RequestMethod.POST)
-    public ResponseBean taBuildingIntentionAddOrUpdate(@RequestBody List<TdBizEvent> tdBizEventList, @PathVariable String buildingId){
+    public ResponseBean taBuildingIntentionAddOrUpdate(@RequestBody List<TdBizEvent> tdBizEventList, @PathVariable String buildingId, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iTaBuildingIntentionService.taBuildingIntentionAddOrUpdate(tdBizEventList, buildingId);
+        responseBean = iTaBuildingIntentionService.taBuildingIntentionAddOrUpdate(tdBizEventList, buildingId, getOrgId(request));
         return responseBean;
     }
 

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

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import com.huiju.estateagents.base.BaseController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -51,13 +52,15 @@ public class TaBuildingReportController extends BaseController {
      */
     @RequestMapping(value="/admin/taBuildingReports",method= RequestMethod.GET)
     public ResponseBean taBuildingReportList(@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();
         try {
             //使用分页插件
 		    IPage<TaBuildingReport> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaBuildingReport> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
+            queryWrapper.eq("org_id", getOrgId(request));
 
             IPage<TaBuildingReport> result = iTaBuildingReportService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
@@ -74,19 +77,21 @@ public class TaBuildingReportController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/taBuildingReport/add",method= RequestMethod.POST)
-    public ResponseBean taBuildingReportAdd(@RequestBody String jsonString){
+    public ResponseBean taBuildingReportAdd(@RequestBody String jsonString, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        Integer orgId = getOrgId(request);
         try {
             JSONArray jsonArray = JSONObject.parseObject(jsonString).getJSONArray("list");
             List<TaBuildingReport> list = new ArrayList<>();
             jsonArray.stream().forEach(e -> {
                 TaBuildingReport taBuildingReport = new TaBuildingReport();
+                taBuildingReport.setOrgId(orgId);
                 taBuildingReport.setReportCode(e.toString());
                 taBuildingReport.setCreateDate(LocalDateTime.now());
                 list.add(taBuildingReport);
             });
             //先删除在添加
-            iTaBuildingReportService.deleteAll();
+            iTaBuildingReportService.deleteAll(orgId);
             if (iTaBuildingReportService.saveBatch(list)){
                 responseBean.addSuccess("保存成功");
             }else {
@@ -128,9 +133,11 @@ public class TaBuildingReportController extends BaseController {
      */
     @RequestMapping(value="/taBuildingReport/{id}",method= RequestMethod.PUT)
     public ResponseBean taBuildingReportUpdate(@PathVariable Integer id,
-                                        @RequestBody TaBuildingReport taBuildingReport){
+                                        @RequestBody TaBuildingReport taBuildingReport,
+                                               HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            taBuildingReport.setOrgId(getOrgId(request));
             if (iTaBuildingReportService.updateById(taBuildingReport)){
                 responseBean.addSuccess(taBuildingReport);
             }else {

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

@@ -0,0 +1,249 @@
+package com.huiju.estateagents.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import io.swagger.annotations.ApiOperation;
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaChannel;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.mapper.TaChannelMapper;
+import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.TaChannelService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import org.apache.http.HttpRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+
+
+/**
+ * <p>
+    *   前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-17
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "渠道管理", tags = "渠道管理")
+public class TaChannelController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaChannelController.class);
+
+    @Autowired
+    public TaChannelService taChannelService;
+
+    @Autowired
+    public ITaPersonService taPersonService;
+
+    @Autowired
+    public TaChannelMapper taChannelMapper;
+
+
+    /**
+     * 渠道管理列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "渠道管理列表", notes = "渠道管理列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "channelId", paramType = "query",value = "渠道Id"),
+    })
+    @RequestMapping(value="/admin/channel",method= RequestMethod.GET)
+    public ResponseBean channelList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                    @RequestParam(value ="channelId",required = false) Integer channelId,
+                                    HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        Integer orgId = getOrgId(request);
+        try {
+            //使用分页插件
+		    IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
+            IPage<TaChannel> result = taChannelMapper.pageTaChannel(pg,orgId,channelId);
+            HashMap hashMap  = new HashMap<>();
+            hashMap.put("result",result);
+            // 下拉列表的数据 all
+            List<TaChannel> taChannelList = taChannelMapper.selectChannelList(orgId);
+            hashMap.put("channelNmae",taChannelList);
+            responseBean.addSuccess(hashMap);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 渠道保存
+     * @param channel 实体对象
+     * @return
+     */
+    @ApiOperation(value = "渠道保存", notes = "渠道保存")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = TaChannel.class, name = "channel", paramType = "body",value = "当前对象"),
+    })
+    @RequestMapping(value="/admin/channel",method= RequestMethod.POST)
+    public ResponseBean channelAdd(@RequestBody TaChannel channel ,HttpServletRequest request){
+        Integer orgId = getOrgId(request);
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            // 生成6位数的渠道码
+            int channelCode= taChannelMapper.channelCode();
+            channel.setChannelCode(String.valueOf(channelCode));
+            channel.setOrgId(orgId);
+            if (taChannelService.save(channel)){
+                responseBean.addSuccess(channel);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "根据渠道ID删除", notes = "根据渠道ID删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "id", paramType = "query",value = "渠道id"),
+    })
+    @ResponseBody
+    @RequestMapping(value="/channel/{id}", method= RequestMethod.DELETE)
+    public ResponseBean channelDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(taChannelService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param channel 实体对象
+     * @return
+     */
+    @ApiOperation(value = "根据渠道ID修改", notes = "根据渠道ID修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "id", paramType = "query",value = "渠道id"),
+    })
+    @RequestMapping(value="/admin/channel/{id}",method= RequestMethod.PUT)
+    public ResponseBean channelUpdate(@PathVariable Integer id,
+                                        @RequestBody TaChannel channel){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            channel.setChannelId(id);
+            if (taChannelService.updateById(channel)){
+                responseBean.addSuccess(channel);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "根据渠道ID查询", notes = "根据渠道ID查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "id", paramType = "query",value = "渠道id"),
+    })
+    @RequestMapping(value="/admin/channel/{id}",method= RequestMethod.GET)
+    public ResponseBean channelGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(taChannelService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 渠道管理下的经纪人
+     */
+    @ApiOperation(value = "渠道管理下的经纪人", notes = "渠道管理下的经纪人")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, name = "name", paramType = "query",value = "姓名"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "phone", paramType = "query",value = "电话"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "channelId", paramType = "query",value = "渠道id"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "多少页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "每页多少条"),
+    })
+    @RequestMapping(value="/admin/channel/broker",method= RequestMethod.GET)
+    public  ResponseBean channelBrokerList(@RequestParam(value="name",required = false) String name,
+                                           @RequestParam(value="phone",required = false) String phone,
+                                           @RequestParam(value="channelId",required = false) Integer channelId,
+                                           @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                           HttpServletRequest request){
+        Integer orgid = getOrgId(request);
+        ResponseBean taPerson =  taPersonService.channelBrokerList(name,phone,pageNum,pageSize,orgid,channelId);
+        return taPerson;
+    }
+
+    /**
+     * 渠道邀请经纪人列表
+     */
+    @ApiOperation(value = "渠道邀请经纪人列表", notes = "渠道邀请经纪人列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, name = "id", paramType = "query",value = "姓名"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "phone", paramType = "query",value = "电话"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "channelId", paramType = "query",value = "渠道id"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "多少页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "每页多少条"),
+    })
+    @RequestMapping(value="/admin/channel/InviteClientsList",method= RequestMethod.GET)
+    public  ResponseBean InviteClientsList(@RequestParam(value="id",required = false) String id,
+                                           @RequestParam(value="phone",required = false) String phone,
+                                           @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                           HttpServletRequest request){
+        ResponseBean taPerson =  taPersonService.InviteClientsList(id,phone,pageNum,pageSize);
+        return taPerson;
+    }
+}

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

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

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

@@ -39,7 +39,7 @@ public class TaChatController extends BaseController {
     @GetMapping("/wx/chat/history")
     public ResponseBean getChatHistory(@RequestParam String chatWith, @RequestParam int pageNumber, @RequestParam int pageSize, HttpServletRequest request) {
         // 消息发送人
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
 
         return taChatService.getChatHistory(openid, chatWith, pageNumber, pageSize);
     }
@@ -52,7 +52,7 @@ public class TaChatController extends BaseController {
     @GetMapping("/wx/chat/with")
     public ResponseBean getChatWithList( @RequestParam int pageNumber, @RequestParam int pageSize, HttpServletRequest request) {
         // 当前人员
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
 
         return taChatService.getChatWithList(openid, pageNumber, pageSize);
     }
@@ -65,7 +65,7 @@ public class TaChatController extends BaseController {
     @PutMapping("/wx/chat/message")
     public ResponseBean updateMessageReaded(HttpServletRequest request) {
         // 当前人员
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         return taChatService.updateMessageReadedOf(openid);
     }
 }

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

@@ -97,7 +97,7 @@ public class TaCheckinController extends BaseController {
      */
     @RequestMapping(value="/wx/taCheckin/activity/{activity}",method= RequestMethod.POST)
     public ResponseBean taCheckinAdd(@PathVariable String activity, HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         List<TaPerson> taPersons = iTaPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -131,7 +131,7 @@ public class TaCheckinController extends BaseController {
 
     @GetMapping("/wx/taCheckin/activity/{activityId}/isChecked")
     public ResponseBean isChecked(@PathVariable String activityId, HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         List<TaPerson> taPersons = iTaPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);

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

@@ -54,14 +54,15 @@ public class TaCustomerMessageController extends BaseController {
      */
     @RequestMapping(value="/admin/taCustomerMessage",method= RequestMethod.GET)
     public ResponseBean taCustomerMessageList(@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();
         try {
             //使用分页插件
 		    IPage<TaCustomerMessage> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaCustomerMessage> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
-
+            queryWrapper.eq("org_id", getOrgId(request));
             IPage<TaCustomerMessage> result = iTaCustomerMessageService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
         }catch (Exception e){
@@ -78,9 +79,10 @@ public class TaCustomerMessageController extends BaseController {
      * @return
      */
     @RequestMapping(value="/taCustomerMessage",method= RequestMethod.POST)
-    public ResponseBean taCustomerMessageAdd(@RequestBody TaCustomerMessage taCustomerMessage){
+    public ResponseBean taCustomerMessageAdd(@RequestBody TaCustomerMessage taCustomerMessage, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            taCustomerMessage.setOrgId(getOrgId(request));
             if (iTaCustomerMessageService.save(taCustomerMessage)){
                 responseBean.addSuccess(taCustomerMessage);
             }else {
@@ -124,9 +126,11 @@ public class TaCustomerMessageController extends BaseController {
      */
     @RequestMapping(value="/taCustomerMessage/{id}",method= RequestMethod.PUT)
     public ResponseBean taCustomerMessageUpdate(@PathVariable Integer id,
-                                        @RequestBody TaCustomerMessage taCustomerMessage){
+                                                @RequestBody TaCustomerMessage taCustomerMessage,
+                                                HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            taCustomerMessage.setOrgId(getOrgId(request));
             if (iTaCustomerMessageService.updateById(taCustomerMessage)){
                 responseBean.addSuccess(taCustomerMessage);
             }else {
@@ -166,12 +170,13 @@ public class TaCustomerMessageController extends BaseController {
     public ResponseBean wxCustomerMessageAdd(@RequestBody TaCustomerMessage taCustomerMessage, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            String openid = JWTUtils.getSubject(request);
+            String openid = getOpenId(request);
             TaPerson taPersons = taPersonService.getPersonsByOpenId(openid).get(0);
             taCustomerMessage.setStatus(CommConstant.STATUS_UNACCALIMED);
             taCustomerMessage.setCreateDate(LocalDateTime.now());
             taCustomerMessage.setPersonId(taPersons.getPersonId());
             taCustomerMessage.setNickname(taPersons.getNickname());
+            taCustomerMessage.setOrgId(getOrgId(request));
             if (iTaCustomerMessageService.save(taCustomerMessage)){
                 responseBean.addSuccess(taCustomerMessage);
             }else {

src/main/java/com/huiju/estateagents/controller/TaDocumentImgController.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.TaDocumentImg;
+import com.huiju.estateagents.service.ITaDocumentImgService;
+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 2019-10-23
+ */
+@RestController
+@RequestMapping("/")
+public class TaDocumentImgController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaDocumentImgController.class);
+
+    @Autowired
+    public ITaDocumentImgService iTaDocumentImgService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/documentImg",method= RequestMethod.GET)
+    public ResponseBean documentImgList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaDocumentImg> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaDocumentImg> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaDocumentImg> result = iTaDocumentImgService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentImgList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param documentImg 实体对象
+     * @return
+     */
+    @RequestMapping(value="/documentImg",method= RequestMethod.POST)
+    public ResponseBean documentImgAdd(@RequestBody TaDocumentImg documentImg){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaDocumentImgService.save(documentImg)){
+                responseBean.addSuccess(documentImg);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentImgAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/documentImg/{id}", method= RequestMethod.DELETE)
+    public ResponseBean documentImgDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaDocumentImgService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentImgDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param documentImg 实体对象
+     * @return
+     */
+    @RequestMapping(value="/documentImg/{id}",method= RequestMethod.PUT)
+    public ResponseBean documentImgUpdate(@PathVariable Integer id,
+                                        @RequestBody TaDocumentImg documentImg){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaDocumentImgService.updateById(documentImg)){
+                responseBean.addSuccess(documentImg);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentImgUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/documentImg/{id}",method= RequestMethod.GET)
+    public ResponseBean documentImgGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaDocumentImgService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentImgDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,305 @@
+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.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.event.EventBus;
+import com.huiju.estateagents.service.ITaDocumentImgService;
+import com.huiju.estateagents.service.ITaDocumentVerifyService;
+import com.huiju.estateagents.service.ITaPersonService;
+import io.swagger.models.auth.In;
+import org.apache.ibatis.annotations.Param;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+    * 资料审核  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-10-23
+ */
+@RestController
+@RequestMapping("/api")
+public class TaDocumentVerifyController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaDocumentVerifyController.class);
+
+    @Autowired
+    public ITaDocumentVerifyService iTaDocumentVerifyService;
+
+    @Autowired
+    public ITaPersonService taPersonService;
+
+    @Autowired
+    public ITaDocumentImgService documentImgService;
+
+
+    @Autowired
+    private ApplicationContext applicationContext;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/documentVerify",method= RequestMethod.GET)
+    public ResponseBean documentVerifyList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                           @RequestParam(value ="name",required = false) String name,
+                                           @RequestParam(value ="tel",required = false) String tel,
+                                           @RequestParam(value = "startDate",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)LocalDateTime startDate,
+                                           @RequestParam(value = "endDate",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)LocalDateTime endDate,
+                                           HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaDocumentVerifyService.getAdminDocumentList(pageNum,pageSize,name,tel,getOrgId(request),startDate,endDate);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentVerifyList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 微信查询我的审核列表
+     * @return
+     */
+    @RequestMapping(value="/wx/documentVerify/list",method= RequestMethod.GET)
+    public ResponseBean wxDocumentVerifyList(HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        Integer orgId = getOrgId(request);
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        try {
+            QueryWrapper<TaDocumentVerify> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("person_id",person.getPersonId());
+            queryWrapper.eq("org_id",orgId);
+            queryWrapper.orderByAsc("verify_status");
+            List<TaDocumentVerify>result = iTaDocumentVerifyService.list(queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentVerifyList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param documentVerify List<TaDocumentImg>
+     * @return
+     */
+    @RequestMapping(value="/wx/documentVerify",method= RequestMethod.POST)
+    public ResponseBean wxDocumentVerifyAdd(@RequestBody TaDocumentVerify documentVerify, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        Integer orgId = getOrgId(request);
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        documentVerify.setCreateDate(LocalDateTime.now());
+        documentVerify.setOrgId(orgId);
+        documentVerify.setPersonId(person.getPersonId());
+        documentVerify.setStatus(CommConstant.STATUS_NORMAL);
+        documentVerify.setVerifyStatus(CommConstant.VERIFY_READY);
+        List<TaDocumentImg>list = documentVerify.getImgList();
+        try {
+            if (iTaDocumentVerifyService.save(documentVerify)){
+                for(int i =0; i<list.size();i++){
+                    list.get(i).setCreateDate(LocalDateTime.now());
+                    list.get(i).setDocumentVerifyId(documentVerify.getDocumentVerifyId());
+                    list.get(i).setOrgId(orgId);
+                    list.get(i).setPersonId(person.getPersonId());
+                }
+                documentImgService.saveBatch(list);
+                documentVerify.setImgList(list);
+                responseBean.addSuccess(documentVerify);
+
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentVerifyAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/documentVerify/{id}", method= RequestMethod.DELETE)
+    public ResponseBean documentVerifyDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaDocumentVerifyService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentVerifyDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 微信查询对象
+     * @return
+     */
+    @RequestMapping(value="/wx/documentVerify/{id}",method= RequestMethod.GET)
+    public ResponseBean wxDocumentVerifyGetThis(@PathVariable Integer id,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        Integer orgId = getOrgId(request);
+        TaDocumentVerify verify = iTaDocumentVerifyService.getById(id);
+        if (null != verify) {
+            QueryWrapper<TaDocumentImg> documentImgQueryWrapper = new QueryWrapper<>();
+            documentImgQueryWrapper.eq("document_verify_id", verify.getDocumentVerifyId());
+            documentImgQueryWrapper.eq("person_id", verify.getPersonId());
+            documentImgQueryWrapper.eq("org_id", orgId);
+            List<TaDocumentImg> documentImgList = documentImgService.list(documentImgQueryWrapper);
+            verify.setImgList(documentImgList);
+        }
+
+        responseBean.addSuccess(verify);
+        return responseBean;
+    }
+
+    /**
+     * 微信修改对象
+     * @param id  实体ID
+     * @return
+     */
+    @RequestMapping(value="/wx/documentVerify/{id}",method= RequestMethod.PUT)
+    public ResponseBean wxDocumentVerifyUpdate(@PathVariable Integer id,
+                                               @RequestBody TaDocumentVerify documentVerify,
+                                               HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        Integer orgId = getOrgId(request);
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        documentVerify.setDocumentVerifyId(id);
+        documentVerify.setVerifyStatus(CommConstant.VERIFY_READY);
+        List<TaDocumentImg>list = documentVerify.getImgList();
+        try {
+            if (iTaDocumentVerifyService.updateById(documentVerify)){
+                QueryWrapper<TaDocumentImg>queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("document_verify_id",documentVerify.getDocumentVerifyId());
+                documentImgService.remove(queryWrapper);
+                for(int i =0; i<list.size();i++){
+                    list.get(i).setCreateDate(LocalDateTime.now());
+                    list.get(i).setDocumentVerifyId(documentVerify.getDocumentVerifyId());
+                    list.get(i).setOrgId(orgId);
+                    list.get(i).setPersonId(person.getPersonId());
+                }
+                documentImgService.saveBatch(list);
+                documentVerify.setImgList(list);
+                responseBean.addSuccess(documentVerify);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentVerifyUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param documentVerify 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/documentVerify/{id}",method= RequestMethod.PUT)
+    public ResponseBean documentVerifyUpdate(@PathVariable Integer id,
+                                             @RequestBody TaDocumentVerify documentVerify,
+                                             HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        if (documentVerify.getVerifyStatus().equals(CommConstant.STATUS_NORMAL)){
+            Integer userId = getUserId(request);
+            documentVerify.setVerifyUser(userId.toString());
+        }
+        try {
+            documentVerify.setDocumentVerifyId(id);
+            if (iTaDocumentVerifyService.updateById(documentVerify)){
+
+                if (null != documentVerify.getVerifyStatus() && documentVerify.getVerifyStatus().intValue() == 1) {
+                    // 活动核销加积分
+                    TaDocumentVerify verify = iTaDocumentVerifyService.getById(documentVerify.getDocumentVerifyId());
+
+                    // 资料审核加积分
+                    applicationContext.publishEvent(new EventBus(verify, EventBus.EventType.DocumentVerify,verify.getOrgId()));
+
+                }
+
+                responseBean.addSuccess(documentVerify);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentVerifyUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/documentVerify/{id}",method= RequestMethod.GET)
+    public ResponseBean documentVerifyGet(@PathVariable String id,
+                                          @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize,
+                                          HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            IPage<TaDocumentVerify> documentVerify = iTaDocumentVerifyService.getDocumentVerifyList(pageNum,pageSize,id,getOrgId(request));
+            responseBean.addSuccess(documentVerify);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentVerifyDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -56,6 +56,7 @@ public class TaEventPropertiesController extends BaseController {
             QueryWrapper<TaEventProperties> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq(!StringUtils.isEmpty(eventType), "event_type", eventType);
             queryWrapper.eq(!StringUtils.isEmpty(buildingId), "building_id", buildingId);
+            queryWrapper.groupBy("event_type");
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaEventProperties> result = iTaEventPropertiesService.page(pg, queryWrapper);

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

@@ -35,7 +35,7 @@ public class TaFavorController extends BaseController {
      */
     @PostMapping("/wx/{typeOf}/like/{id}")
     public ResponseBean giveFavor(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
 
         return taFavorService.postLike(openid, typeOf, id);
     }
@@ -49,7 +49,7 @@ public class TaFavorController extends BaseController {
      */
     @DeleteMapping("/wx/{typeOf}/like/{id}")
     public ResponseBean cancelFavor(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         return taFavorService.cancelLike(openid, typeOf, id);
     }
 }

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

@@ -9,21 +9,24 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaGoods;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaGoodsService;
+import com.huiju.estateagents.service.ITaPersonService;
+import io.swagger.annotations.Api;
+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.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.lang.invoke.ConstantCallSite;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -35,6 +38,7 @@ import java.lang.invoke.ConstantCallSite;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "商品", tags = "商品")
 public class TaGoodsController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaGoodsController.class);
@@ -45,12 +49,25 @@ public class TaGoodsController extends BaseController {
     @Autowired
     public ITaBuildingService iTaBuildingService;
 
+    @Autowired
+    public ITaPersonService taPersonService;
+
     /**
      * 分页查询列表
      * @param pageNum
      * @param pageSize
      * @return
      */
+    @ApiOperation(value = "后台商品列表", notes = "后台商品列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "goodsName", paramType = "query",value = "商品名称"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "priceLesser", paramType = "query",value = "价格小"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "priceGreater", paramType = "query",value = "价格大"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "status", paramType = "query",value = "状态")
+    })
     @RequestMapping(value="/admin/taGoods",method= RequestMethod.GET)
     public ResponseBean taGoodsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
@@ -58,7 +75,7 @@ public class TaGoodsController extends BaseController {
                                     @RequestParam(value = "buildingId",required = false) String buildingId,
                                     @RequestParam(value ="priceLesser",required = false) Integer priceLesser,
                                     @RequestParam(value ="priceGreater",required = false) Integer priceGreater,
-                                    @RequestParam(value ="status",required = false) Integer status){
+                                    @RequestParam(value ="status",required = false) Integer status,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -68,6 +85,7 @@ public class TaGoodsController extends BaseController {
             queryWrapper.lt(null!=priceGreater,"point_price",priceGreater);
             queryWrapper.gt(null != priceLesser,"point_price",priceLesser);
             queryWrapper.eq(null != status,"status",status);
+            queryWrapper.eq("org_id",getOrgId(request));
             queryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id",buildingId);
             queryWrapper.orderByDesc("create_date");
 
@@ -86,14 +104,18 @@ public class TaGoodsController extends BaseController {
      * @param taGoods 实体对象
      * @return
      */
+    @ApiOperation(value = "后台商品保存", notes = "后台商品保存")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "TaGoods", name = "taGoods", paramType = "body",value = "商品详细数据")
+    })
     @RequestMapping(value="/admin/taGoods/add",method= RequestMethod.POST)
-    public ResponseBean taGoodsAdd(@RequestBody TaGoods taGoods){
+    public ResponseBean taGoodsAdd(@RequestBody TaGoods taGoods,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
 
             Integer cityId = iTaBuildingService.getCityById(taGoods.getBuildingId());
             taGoods.setCityId(cityId);
-
+            taGoods.setOrgId(getOrgId(request));
             if (iTaGoodsService.save(taGoods)){
                 responseBean.addSuccess(taGoods);
             }else {
@@ -134,14 +156,18 @@ public class TaGoodsController extends BaseController {
      * @param taGoods 实体对象
      * @return
      */
+    @ApiOperation(value = "后台商品修改", notes = "后台商品修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "TaGoods", name = "taGoods", paramType = "body",value = "商品详细数据")
+    })
     @RequestMapping(value="/admin/taGoods",method= RequestMethod.PUT)
-    public ResponseBean taGoodsUpdate(@RequestBody TaGoods taGoods){
+    public ResponseBean taGoodsUpdate(@RequestBody TaGoods taGoods,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
 
             Integer cityId = iTaBuildingService.getCityById(taGoods.getBuildingId());
             taGoods.setCityId(cityId);
-
+            taGoods.setOrgId(getOrgId(request));
             if (iTaGoodsService.updateById(taGoods)){
                 responseBean.addSuccess(taGoods);
             }else {
@@ -160,8 +186,12 @@ public class TaGoodsController extends BaseController {
      * @param taGoods 实体对象
      * @return
      */
+    @ApiOperation(value = "后台商品状态变更", notes = "后台商品状态变更")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "TaGoods", name = "taGoods", paramType = "body",value = "商品详细数据")
+    })
     @RequestMapping(value="/admin/taGoods/change",method= RequestMethod.PUT)
-    public ResponseBean taGoodsChange(@RequestBody TaGoods taGoods){
+    public ResponseBean taGoodsChange(@RequestBody TaGoods taGoods,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             if(null != taGoods.getStatus() && taGoods.getStatus().equals(CommConstant.STATUS_NORMAL)){
@@ -169,6 +199,7 @@ public class TaGoodsController extends BaseController {
             }else {
                 taGoods.setStatus(CommConstant.STATUS_NORMAL);
             }
+            taGoods.setOrgId(getOrgId(request));
             if (iTaGoodsService.updateById(taGoods)){
                 responseBean.addSuccess(taGoods);
             }else {
@@ -186,6 +217,10 @@ public class TaGoodsController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
+    @ApiOperation(value = "后台商品详情", notes = "后台商品详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "path",value = "商品id")
+    })
     @RequestMapping(value="/admin/taGoods/{id}",method= RequestMethod.GET)
     public ResponseBean taGoodsGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
@@ -198,22 +233,43 @@ public class TaGoodsController extends BaseController {
         }
         return responseBean;
     }
-    
+
+
+    @ApiOperation(value = "微信 查询有商品的项目", notes = "微信 查询有商品的项目")
+    @GetMapping(value = "/wx/goodsToBuilding")
+    public ResponseBean wxGoodsToBuilding(@RequestParam(value = "cityId", required = false) Integer cityId, HttpServletRequest request) {
+        return iTaBuildingService.getBuildingListById(getOrgId(request),cityId);
+    }
+
     /**
      * 分页查询列表
-     * @param pageNum
+     * @param pageNumber
      * @param pageSize
      * @return
      */
+    @ApiOperation(value = "微信商品列表", notes = "微信商品列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id")
+    })
     @RequestMapping(value="/wx/goods",method= RequestMethod.GET)
-    public ResponseBean wxGoodsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean wxGoodsList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                     @RequestParam(value = "buildingId",required = false) String buildingId,
-                                    @RequestParam(value = "orgId",required = false) Integer orgId){
+                                    @RequestParam(value = "cityId", required = false) Integer cityId,
+                                    HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
         try {
             //使用分页插件
-            IPage<TaGoods> pg = new Page<>(pageNum, pageSize);
+            IPage<TaGoods> pg = new Page<>(pageNumber, pageSize);
             QueryWrapper<TaGoods> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             if (!StringUtils.isEmpty(buildingId)){
@@ -222,10 +278,16 @@ public class TaGoodsController extends BaseController {
             if (null != orgId){
                 queryWrapper.eq("org_id", orgId);
             }
+            if (null != cityId){
+                queryWrapper.eq("city_id", cityId);
+            }
             queryWrapper.orderByDesc("order_no");
             queryWrapper.orderByDesc("create_date");
             
             IPage<TaGoods> result = iTaGoodsService.page(pg, queryWrapper);
+            Map<String,Object> data = new HashMap<>();
+            data.put("goods",result);
+            data.put("person",person);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -240,6 +302,10 @@ public class TaGoodsController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
+    @ApiOperation(value = "微信商品详情", notes = "微信商品详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "path",value = "商品id")
+    })
     @RequestMapping(value="/wx/goods/{id}",method= RequestMethod.GET)
     public ResponseBean wxGoodsGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
@@ -259,11 +325,15 @@ public class TaGoodsController extends BaseController {
      * @param request
      * @return
      */
+    @ApiOperation(value = "微信兑换商品接口", notes = "微信兑换商品接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "path",value = "商品id")
+    })
     @RequestMapping(value="/wx/goods/exchange/{id}",method= RequestMethod.POST)
     public ResponseBean wxExchangeGoods(@PathVariable Integer id, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            String openid = JWTUtils.getSubject(request);
+            String openid = getOpenId(request);
             //兑换商品
             String state = iTaGoodsService.exchangeGoods(id,openid);
             if (state.equals(CommConstant.SUCCESS)){

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

@@ -18,7 +18,7 @@ public class TaMiniFormidsController extends BaseController {
 
     @PostMapping("/formid")
     public ResponseBean save(@RequestBody String paramStr, HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
 
         return taMiniFormidsService.saveFormidBy(openid, paramStr);
     }

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

@@ -0,0 +1,218 @@
+package com.huiju.estateagents.controller;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.common.WxUtils;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.service.IMiniAppService;
+import com.huiju.estateagents.service.ITaMiniappService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.tomcat.jni.Mmap;
+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.util.HashMap;
+
+/**
+ * <p>
+    * 小程序表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@RestController
+@RequestMapping("/api")
+public class TaMiniappController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaMiniappController.class);
+
+    @Autowired
+    public ITaMiniappService iTaMiniappService;
+
+    @Autowired
+    private IMiniAppService miniAppService;
+
+    @Autowired
+    WxUtils wxUtils;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/center/taMiniapp",method= RequestMethod.GET)
+    public ResponseBean taMiniappList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaMiniapp> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaMiniapp> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaMiniapp> result = iTaMiniappService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taMiniapp 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/taMiniapp",method= RequestMethod.POST)
+    public ResponseBean taMiniappAdd(@RequestBody TaMiniapp taMiniapp, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+
+        try {
+            iTaMiniappService.saveInfoWithTpls(taMiniapp);
+            responseBean.addSuccess(taMiniapp);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taMiniapp/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taMiniappDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaMiniappService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taMiniapp 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/taMiniapp/{id}",method= RequestMethod.PUT)
+    public ResponseBean taMiniappUpdate(@PathVariable String id,
+                                        @RequestBody TaMiniapp taMiniapp){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taMiniapp.setMiniappId(id);
+            if (iTaMiniappService.updateById(taMiniapp)){
+                responseBean.addSuccess(taMiniapp);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/center/taMiniapp/{id}",method= RequestMethod.GET)
+    public ResponseBean taMiniappGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaMiniappService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    @PostMapping(value = "center/check/taMiniapp")
+    public ResponseBean createQRCode(@RequestBody String paramStr) {
+        if (StringUtils.isEmpty(paramStr)) {
+            return ResponseBean.error("参数不能为空", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        JSONObject params = JSONObject.parseObject(paramStr);
+        if (null == params) {
+            return ResponseBean.error("非法参数", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        String appid = params.getString("miniappId");
+        String secret = params.getString("secret");
+        String path = params.getString("path");
+
+        if (StringUtils.isEmpty(appid) || StringUtils.isEmpty(secret) || StringUtils.isEmpty(path)) {
+            return ResponseBean.error("缺失参数", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        TaMiniapp taMiniapp = null;
+        WxMaService service = wxUtils.getMiniApp(appid);
+        if (null != service) {
+            taMiniapp = iTaMiniappService.getById(appid);
+            if (null == taMiniapp) {
+                return ResponseBean.error("异常, 请联系技术人员", ResponseBean.ERROR_UNAVAILABLE);
+            }
+        }
+
+        if (null == service || !secret.equals(taMiniapp.getSecret())){
+            service = wxUtils.newService(new TaMiniapp(){{
+                setMiniappId(appid);
+                setSecret(secret);
+                setToken(params.getString("token"));
+            }});
+        }
+
+        try {
+            String qrCode = miniAppService.createQrCode(service, path);
+            return ResponseBean.success(new HashMap<String, Object>(){{
+                put("qrCode", qrCode);
+            }});
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseBean.error("校验不通过", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    @ApiOperation(value = "获取小程序名称", notes = "获取小程序名称")
+    @GetMapping(value = "/admin/getMiniappName")
+    public ResponseBean getMiniappName(HttpServletRequest request){
+        Integer orgId = getOrgId(request);
+        QueryWrapper<TaMiniapp> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", orgId);
+        TaMiniapp one = iTaMiniappService.getOne(queryWrapper);
+
+        ResponseBean responseBean = new ResponseBean();
+        responseBean.addSuccess((Object) one.getName());
+
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,146 @@
+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.TaMiniappTemplate;
+import com.huiju.estateagents.service.ITaMiniappTemplateService;
+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 2019-09-11
+ */
+@RestController
+@RequestMapping("/")
+public class TaMiniappTemplateController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaMiniappTemplateController.class);
+
+    @Autowired
+    public ITaMiniappTemplateService iTaMiniappTemplateService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/center/taMiniappTemplate/{miniAppId}",method= RequestMethod.GET)
+    public ResponseBean taMiniappTemplateList(@PathVariable String miniappId,
+                                        @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaMiniappTemplate> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaMiniappTemplate> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("miniapp_id",miniappId);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaMiniappTemplate> result = iTaMiniappTemplateService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappTemplateList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taMiniappTemplate 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/taMiniappTemplate",method= RequestMethod.POST)
+    public ResponseBean taMiniappTemplateAdd(@RequestBody TaMiniappTemplate taMiniappTemplate){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaMiniappTemplateService.save(taMiniappTemplate)){
+                responseBean.addSuccess(taMiniappTemplate);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappTemplateAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/center/taMiniappTemplate/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taMiniappTemplateDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaMiniappTemplateService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappTemplateDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taMiniappTemplate 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/taMiniappTemplate/{id}",method= RequestMethod.PUT)
+    public ResponseBean taMiniappTemplateUpdate(@PathVariable Integer id,
+                                        @RequestBody TaMiniappTemplate taMiniappTemplate){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taMiniappTemplate.setSerialNo(id);
+            if (iTaMiniappTemplateService.updateById(taMiniappTemplate)){
+                responseBean.addSuccess(taMiniappTemplate);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappTemplateUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/center/taMiniappTemplate/{id}",method= RequestMethod.GET)
+    public ResponseBean taMiniappTemplateGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaMiniappTemplateService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taMiniappTemplateDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -7,12 +7,17 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaNews;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaNewsService;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaSaveService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.checkerframework.checker.units.qual.A;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,6 +44,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "资讯", tags = "资讯")
 public class TaNewsController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaNewsController.class);
@@ -62,14 +68,24 @@ public class TaNewsController extends BaseController {
      * @param pageSize
      * @return
      */
+    @ApiOperation(value = "资讯列表", notes = "资讯列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "newsTypeId", paramType = "query",value = "资讯类型id"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "newsStatus", paramType = "query",value = "状态"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "title", paramType = "query",value = "标题")
+    })
     @RequestMapping(value="/admin/taNews",method= RequestMethod.GET)
-    public ResponseBean taNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean taNewsList(HttpServletRequest request,
+                                   @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                    @RequestParam(value = "buildingId", required = false) String buildingId,
-                                   @RequestParam(value = "orgId", required = false) Integer orgId,
                                    @RequestParam(value = "newsTypeId", required = false) Integer newsTypeId,
-                                   @RequestParam(value = "newsStatus", required = false) Integer newsStatus){
-        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, orgId, newsTypeId, newsStatus);
+                                   @RequestParam(value = "newsStatus", required = false) Integer newsStatus,
+                                   @RequestParam(value = "title", required = false) String title){
+        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, getOrgId(request), newsTypeId, newsStatus,title);
         return responseBean;
     }
 
@@ -80,7 +96,7 @@ public class TaNewsController extends BaseController {
      * @return
      */
     @RequestMapping(value="/wx/taNews",method= RequestMethod.GET)
-    public ResponseBean wxTaNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean wxTaNewsList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                      @RequestParam(required = false) String buildingId,
                                      @RequestParam(required = false) Integer cityId,
@@ -88,8 +104,9 @@ public class TaNewsController extends BaseController {
                                      HttpServletRequest request
     ){
         List<String> targets = new ArrayList<>();
+        Integer orgId = getOrgId(request);
         if (null != mine && mine) {
-            String openid = JWTUtils.getSubject(request);
+            String openid = getOpenId(request);
             List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
             if (null == persons || persons.size() == 0) {
                 return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -98,7 +115,7 @@ public class TaNewsController extends BaseController {
             targets = iTaSaveService.getTargesOfPerson(persons.get(0).getPersonId(), CommConstant.FAVOR_NEWS);
         }
 
-        IPage<TaNews> results = iTaNewsService.getWxList(pageNum, pageSize, buildingId, targets,cityId,mine);
+        IPage<TaNews> results = iTaNewsService.getWxList(pageNumber, pageSize, buildingId, targets,cityId,mine,orgId);
         return ResponseBean.success(results);
     }
 
@@ -107,10 +124,15 @@ public class TaNewsController extends BaseController {
      * @param taNews 实体对象
      * @return
      */
+    @ApiOperation(value = "保存资讯", notes = "保存资讯")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "TaNews", name = "taNews", paramType = "body",value = "资讯详细数据")
+    })
     @RequestMapping(value="/admin/taNews",method= RequestMethod.POST)
-    public ResponseBean taNewsAdd(@RequestBody TaNews taNews){
+    public ResponseBean taNewsAdd(@RequestBody TaNews taNews, HttpServletRequest request){
         Integer cityId = iTaBuildingService.getCityById(taNews.getBuildingId());
         taNews.setCityId(cityId);
+        taNews.setOrgId(getOrgId(request));
         ResponseBean responseBean = iTaNewsService.addTaNews(taNews);
         return responseBean;
     }
@@ -132,12 +154,19 @@ public class TaNewsController extends BaseController {
      * @param taNews 实体对象
      * @return
      */
+    @ApiOperation(value = "修改资讯", notes = "修改资讯")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "TaNews", name = "taNews", paramType = "body",value = "资讯数据"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "taNews", paramType = "path", value = "资讯id")
+    })
     @RequestMapping(value="/admin/taNews/{id}",method= RequestMethod.PUT)
     public ResponseBean taNewsUpdate(@PathVariable Integer id,
-                                        @RequestBody TaNews taNews){
+                                        @RequestBody TaNews taNews,
+                                     HttpServletRequest request){
         taNews.setNewsId(id);
         Integer cityId = iTaBuildingService.getCityById(taNews.getBuildingId());
         taNews.setCityId(cityId);
+        taNews.setOrgId(getOrgId(request));
         ResponseBean responseBean = iTaNewsService.updateTaNews(taNews);
         return responseBean;
     }
@@ -146,19 +175,45 @@ public class TaNewsController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
+    @ApiOperation(value = "咨询详情", notes = "咨询详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "path",value = "资讯id")
+    })
     @RequestMapping(value="/admin/taNews/{id}",method= RequestMethod.GET)
     public ResponseBean taNewsGet(@PathVariable Integer id){
         ResponseBean responseBean = iTaNewsService.getTaNewsById(id);
         return responseBean;
     }
 
+    @ApiOperation(value = "资讯置顶", notes = "资讯置顶")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "String", name = "newsId", paramType = "query",value = "资讯ID"),
+            @ApiImplicitParam(dataType = "Integer", name = "weight", paramType = "query",value = "权重")
+    })
+    @RequestMapping(value = "/admin/taNews/weight" ,method =RequestMethod.PUT)
+    public  ResponseBean buildingDynamicWeight(@RequestParam Integer newsId,@RequestParam Integer weight,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        TaNews taNews = iTaNewsService.getById(newsId);
+        taNews.setWeight(weight);
+        taNews.setOrgId(getOrgId(request));
+        QueryWrapper<TaNews> newsQueryWrapper = new QueryWrapper<>();
+        newsQueryWrapper.eq("news_id",newsId);
+        if (iTaNewsService.updateById(taNews)){
+            responseBean.addSuccess("成功");
+        }else {
+            responseBean.addError("失败");
+        }
+        return responseBean;
+    }
+
+
     /**
      * 微信 根据id查询对象
      * @param id  实体ID
      */
     @RequestMapping(value="/wx/taNews/{id}",method= RequestMethod.GET)
     public ResponseBean wxTaNewsGet(@PathVariable Integer id,HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
         if (null == persons || persons.size() == 0) {
             return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);

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

@@ -7,6 +7,10 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaNewsType;
 import com.huiju.estateagents.service.ITaNewsTypeService;
+import io.swagger.annotations.Api;
+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;
@@ -18,6 +22,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 资讯类型表  前端控制器
@@ -28,6 +34,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "资讯类型", tags = "资讯类型")
 public class TaNewsTypeController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaNewsTypeController.class);
@@ -42,12 +49,18 @@ public class TaNewsTypeController extends BaseController {
      * @param pageSize
      * @return
      */
+    @ApiOperation(value = "查询资讯类型", notes = "查询资讯类型")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id")
+    })
     @RequestMapping(value="/admin/taNewsType",method= RequestMethod.GET)
     public ResponseBean taNewsTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                        @RequestParam(value = "buildingId", required = false) String buildingId,
-                                       @RequestParam(value = "orgId", required = false) Integer orgId){
-        ResponseBean responseBean = iTaNewsTypeService.getList(pageNum, pageSize, buildingId, orgId);
+                                       HttpServletRequest request){
+        ResponseBean responseBean = iTaNewsTypeService.getList(pageNum, pageSize, buildingId, getOrgId(request));
         return responseBean;
     }
 
@@ -56,9 +69,13 @@ public class TaNewsTypeController extends BaseController {
      * @param taNewsType 实体对象
      * @return
      */
+    @ApiOperation(value = "保存资讯类型", notes = "保存资讯类型")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "TaNewsType", name = "taNewsType", paramType = "body",value = "资讯类型数据")
+    })
     @RequestMapping(value="/admin/taNewsType",method= RequestMethod.POST)
-    public ResponseBean taNewsTypeAdd(@RequestBody TaNewsType taNewsType){
-        ResponseBean responseBean = iTaNewsTypeService.addTaNewsType(taNewsType);
+    public ResponseBean taNewsTypeAdd(@RequestBody TaNewsType taNewsType, HttpServletRequest request){
+        ResponseBean responseBean = iTaNewsTypeService.addTaNewsType(taNewsType, getOrgId(request));
         return responseBean;
     }
 
@@ -79,10 +96,16 @@ public class TaNewsTypeController extends BaseController {
      * @param taNewsType 实体对象
      * @return
      */
+    @ApiOperation(value = "修改资讯类型", notes = "根据ID修改资讯类型")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "TaNewsType", name = "taNewsType", paramType = "body",value = "资讯类型数据"),
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "path",value = "资讯id")
+    })
     @RequestMapping(value="/admin/taNewsType/{id}",method= RequestMethod.PUT)
     public ResponseBean taNewsTypeUpdate(@PathVariable Integer id,
-                                        @RequestBody TaNewsType taNewsType){
+                                        @RequestBody TaNewsType taNewsType, HttpServletRequest request){
         taNewsType.setNewsTypeId(id);
+        taNewsType.setOrgId(getOrgId(request));
         ResponseBean responseBean = iTaNewsTypeService.updateTaNewsType(taNewsType);
         return responseBean;
     }
@@ -91,6 +114,10 @@ public class TaNewsTypeController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
+    @ApiOperation(value = "咨询类型详情", notes = "咨询类型详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "path",value = "资讯id")
+    })
     @RequestMapping(value="/admin/taNewsType/{id}",method= RequestMethod.GET)
     public ResponseBean taNewsTypeGet(@PathVariable Integer id){
         ResponseBean responseBean = iTaNewsTypeService.getTaNewsTypeById(id);

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

@@ -0,0 +1,144 @@
+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.TaOrg;
+import com.huiju.estateagents.service.ITaOrgService;
+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 2019-09-11
+ */
+@RestController
+@RequestMapping("/")
+public class TaOrgController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaOrgController.class);
+
+    @Autowired
+    public ITaOrgService iTaOrgService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/center/taOrg",method= RequestMethod.GET)
+    public ResponseBean taOrgList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaOrg> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaOrg> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaOrg> result = iTaOrgService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taOrg 实体对象
+     * @return
+     */
+    @RequestMapping(value="/center/taOrg",method= RequestMethod.POST)
+    public ResponseBean taOrgAdd(@RequestBody TaOrg taOrg){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaOrgService.save(taOrg)){
+                responseBean.addSuccess(taOrg);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taOrg/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taOrgDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaOrgService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taOrg 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taOrg/{id}",method= RequestMethod.PUT)
+    public ResponseBean taOrgUpdate(@PathVariable Integer id,
+                                        @RequestBody TaOrg taOrg){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taOrg.setOrgId(id);
+            if (iTaOrgService.updateById(taOrg)){
+                responseBean.addSuccess(taOrg);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/center/taOrg/{id}",method= RequestMethod.GET)
+    public ResponseBean taOrgGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaOrgService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taOrgDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -2,20 +2,31 @@ package com.huiju.estateagents.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
-import com.huiju.estateagents.entity.TaBuildingDynamic;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.common.SMSUtils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.service.ITaPersonBuildingService;
 import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.TaChannelPersonService;
+import com.huiju.estateagents.service.TaChannelService;
+import org.checkerframework.checker.units.qual.A;
+import org.checkerframework.checker.units.qual.C;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import com.huiju.estateagents.base.BaseController;
+import org.springframework.web.client.RestTemplate;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -34,6 +45,16 @@ import java.util.Map;
 public class TaPersonController extends BaseController {
     @Autowired
     ITaPersonService taPersonService;
+    @Autowired
+    TaChannelService taChannelService;
+    @Autowired
+    TaChannelPersonService taChannelPersonService;
+    @Autowired
+    ITaUserService taUserService;
+    @Autowired
+    SMSUtils smsUtils;
+    @Autowired
+    ITaPersonBuildingService taPersonBuildingService;
 
     /**
      *
@@ -57,8 +78,9 @@ public class TaPersonController extends BaseController {
         if (pageNumber < 0 || pageSize < 0) {
             return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
+        Integer orgId = getOrgId(request);
         if (mine){
-            String openid = JWTUtils.getSubject(request);
+            String openid = getOpenId(request);
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
             if (null == taPersons || taPersons.size() != 1) {
                 return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -67,13 +89,144 @@ public class TaPersonController extends BaseController {
             IPage<Map<String, Object>>  result = taPersonService.getSavedConsaultants(pageNumber,pageSize,person.getPersonId());
             return ResponseBean.success(result);
         }else {
-            IPage<Map<String, Object>> result = taPersonService.getCardList(pageNumber, pageSize,buildingId);
+            IPage<Map<String, Object>> result = taPersonService.getCardList(pageNumber, pageSize,buildingId,orgId);
             return ResponseBean.success(result);
         }
 
 
     }
 
+    @PutMapping("/wx/registerConsultant")
+    public ResponseBean registerConsultant(HttpServletRequest request,@RequestParam String phone,@RequestParam String code) {
+        ResponseBean responseBean = new ResponseBean();
+        if(!smsUtils.checkCaptcha(phone,code)){
+            responseBean.addError("验证码错误。");
+            return responseBean;
+        }
+        Integer orgId =getOrgId(request);
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("phone",phone);
+        queryWrapper.eq("org_id",orgId);
+        queryWrapper.eq("is_consultant",true);
+        List<TaUser> users = taUserService.list(queryWrapper);
+        if(users.size()>0){
+            TaUser user = users.get(0);
+            person.setPersonType(CommConstant.PERSON_REALTY_CONSULTANT);
+            person.setUserId(user.getUserId());
+            person.setAvatarurl(user.getAvatar());
+            person.setCompany(user.getOrgName());
+            person.setTel(user.getPhone());
+            person.setName(user.getUserName());
+            person.setAddress(user.getAddress());
+            person.setIdNo(user.getIdNo());
+            person.setDepartment(user.getDepartment());
+            person.setPost(user.getPosition());
+            person.setPhoto(user.getPhoto());
+            if(StringUtils.isEmpty(person.getPhone())){
+                person.setPhone(user.getPhone());
+            }
+            taPersonService.updateById(person);
+            responseBean.addSuccess(person);
+        }else {
+            responseBean.addError("此手机号未录入到后台系统，请联系营销云管理员。");
+        }
+        return responseBean;
+    }
+
+    @PutMapping("/wx/registerConsultantOneClick")
+    public ResponseBean registerConsultantOneClick(HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        Integer orgId =getOrgId(request);
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("phone",person.getPhone());
+        queryWrapper.eq("org_id",orgId);
+        queryWrapper.eq("is_consultant",true);
+        List<TaUser> users = taUserService.list(queryWrapper);
+        if(users.size()>0){
+            TaUser user = users.get(0);
+            person.setPersonType(CommConstant.PERSON_REALTY_CONSULTANT);
+            person.setUserId(user.getUserId());
+            person.setAvatarurl(user.getAvatar());
+            person.setCompany(user.getOrgName());
+            person.setTel(user.getPhone());
+            person.setName(user.getUserName());
+            person.setAddress(user.getAddress());
+            person.setIdNo(user.getIdNo());
+            person.setDepartment(user.getDepartment());
+            person.setPost(user.getPosition());
+            person.setPhoto(user.getPhoto());
+            taPersonService.updateById(person);
+            responseBean.addSuccess(person);
+        }else {
+            responseBean.addError("手机号不存在,请联系管理员维护。");
+        }
+        return responseBean;
+    }
+
+    @PutMapping("/wx/registerAgent")
+    public ResponseBean registerAgent(@RequestParam(required = false) String recommendAgentCode, @RequestParam(required = false) String channelCode,HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        Integer orgId =getOrgId(request);
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        person.setAgentCode(taPersonService.agentCodeGenerator());
+        if (!StringUtils.isEmpty(recommendAgentCode)){
+            QueryWrapper<TaPerson> agentWrapper = new QueryWrapper();
+            agentWrapper.eq("agent_code",recommendAgentCode);
+            agentWrapper.eq("org_id",orgId);
+            TaPerson agent = taPersonService.getOne(agentWrapper);
+            if (null != agent){
+                person.setRecommendAgent(agent.getPersonId());
+            }
+        }
+        if(StringUtils.isEmpty(channelCode)){
+            person.setPersonType(CommConstant.PERSON_ESTATE_AGENT);
+        }else {
+            person.setPersonType(CommConstant.PERSON_ESTATE_CHANNEL);
+            QueryWrapper<TaChannel> queryWrapper = new QueryWrapper();
+            queryWrapper.eq("channel_code",channelCode);
+            queryWrapper.eq("org_id",orgId);
+            TaChannel channel = taChannelService.getOne(queryWrapper);
+            if (null == channel){
+                return ResponseBean.error("渠道码不存在",ResponseBean.ERROR_UNAVAILABLE);
+            }
+            QueryWrapper<TaChannelPerson>taChannelPersonQueryWrapper = new QueryWrapper<>();
+            taChannelPersonQueryWrapper.eq("person_id",person.getPersonId());
+            taChannelPersonQueryWrapper.eq("channel_id",channel.getChannelId());
+            taChannelPersonQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+            int count = taChannelPersonService.count(taChannelPersonQueryWrapper);
+            if(count>0){
+                return ResponseBean.error("您已绑定过该渠道",ResponseBean.ERROR_UNAVAILABLE);
+            }
+            TaChannelPerson channelPerson = new TaChannelPerson();
+            channelPerson.setChannelId(channel.getChannelId());
+            channelPerson.setPersonId(person.getPersonId());
+            channelPerson.setCreateDate(LocalDateTime.now());
+            channelPerson.setStatus(CommConstant.STATUS_NORMAL);
+            taChannelPersonService.save(channelPerson);
+        }
+        taPersonService.updateById(person);
+        responseBean.addSuccess(person);
+
+        return responseBean;
+    }
+
     /**
      * 绑定卡片
      * @param paramStr
@@ -84,7 +237,7 @@ public class TaPersonController extends BaseController {
         JSONObject params = JSONObject.parseObject(paramStr);
         String phone = (String) params.get("phone");
         String pass = (String) params.get("pass");
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
 
         if (isEmpty(phone) || isEmpty(pass)) {
             return ResponseBean.error("参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
@@ -110,16 +263,33 @@ public class TaPersonController extends BaseController {
         if (isEmpty(id)) {
             return ResponseBean.error("参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
+//        QueryWrapper<TaPersonBuilding>queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("user_id",person.getUserId());
+//        TaPersonBuilding personBuilding = taPersonBuildingService.getOne(queryWrapper);
 
         return taPersonService.getCardDetail(openid, id,person.getPersonId());
     }
 
+    /**
+     * 获取名片详情
+     * @param id
+     * @return
+     */
+    @GetMapping("/wx/onePerson/{id}")
+    public ResponseBean getPersonByPersonId(@PathVariable String id, HttpServletRequest request) {
+        if (isEmpty(id)) {
+            return ResponseBean.error("参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        TaPerson person = taPersonService.getById(id);
+        return ResponseBean.success(person);
+    }
+
     /**
      * 找回密码
      * @param plat 平台类型 wx 是微信相关, admin 是后台管理系统
@@ -173,7 +343,7 @@ public class TaPersonController extends BaseController {
         }
 
         // 当前人员
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
 
         return taPersonService.resgiteAgent(name, phone, sex, explain, openid);
     }
@@ -203,21 +373,22 @@ public class TaPersonController extends BaseController {
      */
     @GetMapping("/wx/user/info")
     public ResponseBean getUserInfo(HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
 
         return taPersonService.getWxUser(openid);
     }
 
     /**
-     * 个人签到
+     * 个人getPersonId(request);
      * @param request
      * @return
      */
     @PostMapping("/wx/user/signin")
     public ResponseBean userSign(HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
 
-        return taPersonService.getWxUserSign(openid);
+        return taPersonService.getWxUserSign(openid, orgId);
     }
 
 
@@ -233,38 +404,38 @@ public class TaPersonController extends BaseController {
      * @param paramStr
      * @return
      */
-    @PostMapping("/admin/signin")
-    public ResponseBean signin(@RequestBody String paramStr) {
-        JSONObject params = JSONObject.parseObject(paramStr);
-        if (params == null) {
-            return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
-        }
-
-        String userPhone = params.getString("phone");
-        String userCaptcha = params.getString("captcha");
-
-        // todo
-        if (!"1234".equals(userCaptcha)) {
-            return ResponseBean.error("验证码不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-
-        TaPerson taPerson = taPersonService.getPersonByTel(userPhone);
-        if (taPerson == null) {
-            return ResponseBean.error("手机号不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-
-        if (taPerson.getStatus() != CommConstant.STATUS_NORMAL) {
-            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
-        }
-
-        String token = JWTUtils.newToken(taPerson.getPersonId());
-
-        Map<String, Object> result = new HashMap<>();
-        result.put("token", token);
-        result.put("person", taPerson);
-
-        return ResponseBean.success(result);
-    }
+//    @PostMapping("/admin/signin")
+//    public ResponseBean signin(@RequestBody String paramStr) {
+//        JSONObject params = JSONObject.parseObject(paramStr);
+//        if (params == null) {
+//            return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
+//        }
+//
+//        String userPhone = params.getString("phone");
+//        String userCaptcha = params.getString("captcha");
+//
+//        // todo
+//        if (!"1234".equals(userCaptcha)) {
+//            return ResponseBean.error("验证码不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+//        }
+//
+//        TaPerson taPerson = taPersonService.getPersonByTel(userPhone);
+//        if (taPerson == null) {
+//            return ResponseBean.error("手机号不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
+//        }
+//
+//        if (taPerson.getStatus() != CommConstant.STATUS_NORMAL) {
+//            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//
+//        String token = JWTUtils.newToken(taPerson.getPersonId());
+//
+//        Map<String, Object> result = new HashMap<>();
+//        result.put("token", token);
+//        result.put("person", taPerson);
+//
+//        return ResponseBean.success(result);
+//    }
 
     /**
      * 获取当前用户
@@ -273,7 +444,7 @@ public class TaPersonController extends BaseController {
      */
     @GetMapping("/admin/user/current")
     public ResponseBean getCurrentPerson(HttpServletRequest request) {
-        String personId = JWTUtils.getSubject(request);
+        String personId = getPersonId(request);
         TaPerson taPerson = taPersonService.getById(personId);
         if (null == taPerson || taPerson.getStatus() != CommConstant.STATUS_NORMAL) {
             return ResponseBean.error("用户状态异常", ResponseBean.ERROR_AUTH_EXPIRED);
@@ -299,6 +470,32 @@ public class TaPersonController extends BaseController {
         return ResponseBean.success(taPersonIPage);
     }
 
+    @GetMapping("/admin/building/consultant")
+    public ResponseBean getBuildingConsultantList(
+            Integer pageNumber,
+            Integer pageSize,
+            String buildingId
+    ) {
+        if (null == pageNumber) pageNumber = 1;
+        if (null == pageSize) pageSize = 10;
+
+        IPage<TaUser> taPersonIPage = taPersonService.getBuildingConsultantList(pageNumber,pageSize,buildingId);
+        return ResponseBean.success(taPersonIPage);
+    }
+
+    @GetMapping("/wx/building/consultant")
+    public ResponseBean getWxBuildingConsultantList(
+            Integer pageNumber,
+            Integer pageSize,
+            String buildingId
+    ) {
+        if (null == pageNumber) pageNumber = 1;
+        if (null == pageSize) pageSize = 10;
+
+        IPage<TaUser> taPersonIPage = taPersonService.getBuildingConsultantList(pageNumber,pageSize,buildingId);
+        return ResponseBean.success(taPersonIPage);
+    }
+
     @GetMapping("/admin/consultant/{id}")
     public ResponseBean getConsultant(@PathVariable String id) {
         TaPerson taPerson = taPersonService.getById(id);
@@ -325,6 +522,42 @@ public class TaPersonController extends BaseController {
         return taPersonService.editConsultant(id, paramStr);
     }
 
+    @PutMapping("/wx/editPerson")
+    public ResponseBean editWxConsultant(@RequestParam(required = false)String name,@RequestParam(required = false)String avatar,@RequestParam(required = false)String phone,HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        if (!StringUtils.isEmpty(name)){
+            person.setName(name);
+        }
+        if (!StringUtils.isEmpty(avatar)){
+            person.setAvatarurl(avatar);
+        }
+        if (!StringUtils.isEmpty(phone)){
+            person.setTel(phone);
+            if(person.getPersonType().equals(CommConstant.PERSON_REALTY_CONSULTANT)){
+                TaUser user = taUserService.getById(person.getUserId());
+                user.setPhone(phone);
+                user.setLoginName(phone);
+                taUserService.updateById(user);
+            }
+        }
+        try{
+            if(taPersonService.updateById(person)){
+                responseBean.addSuccess(person);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+
+        }
+        return responseBean;
+    }
+
     boolean isEmpty(String str) {
         return null == str || "".equals(str.trim());
     }
@@ -338,7 +571,7 @@ public class TaPersonController extends BaseController {
 //    @GetMapping("/wx/savedPerson")
 //    public ResponseBean getSavedConsaultants(@RequestParam(defaultValue = "1") int pageNumber,
 //                                    @RequestParam(defaultValue = "10") int pageSize,HttpServletRequest request) {
-//        String openid = JWTUtils.getSubject(request);
+//        String openid = getOpenId(request);
 //        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
 //        if (null == taPersons || taPersons.size() != 1) {
 //            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -356,7 +589,157 @@ public class TaPersonController extends BaseController {
 //        }
 //
 //    }
+    /**
+     * 变更经纪人类型
+     * @param channelCode 渠道码
+     * @return
+     */
+    @RequestMapping(value="/wx/customer/recommend/becomeChannel",method= RequestMethod.PUT)
+    public ResponseBean taRecommendAgentBecomeChannel(@RequestParam(required = false) String channelCode,HttpServletRequest request,@RequestParam("personType")String personType){
+        ResponseBean responseBean = new ResponseBean();
 
+        if (org.apache.commons.lang3.StringUtils.isBlank(personType)) {
+            responseBean.addSuccess("personType为空");
+            return responseBean;
+        }
 
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        try {
+            if(CommConstant.PERSON_ESTATE_CHANNEL.equals(personType)){
+                QueryWrapper<TaChannel>channelQueryWrapper = new QueryWrapper<>();
+                channelQueryWrapper.eq("channel_code",channelCode);
+                channelQueryWrapper.eq("org_id",getOrgId(request));
+                QueryWrapper<TaChannelPerson>channelPersonQueryWrapper = new QueryWrapper<>();
+                List<TaChannel> channel = taChannelService.list(channelQueryWrapper);
+                if(channel.size()>0){
+                    channelPersonQueryWrapper.eq("person_id",person.getPersonId());
+                    channelPersonQueryWrapper.eq("channel_id",channel.get(0).getChannelId());
+                    channelPersonQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+                    int count = taChannelPersonService.count(channelPersonQueryWrapper);
+                    if(count >0){
+                        return ResponseBean.error("您已绑定过渠道",ResponseBean.ERROR_UNAVAILABLE);
+                    }
+                    TaChannelPerson channelPerson = new TaChannelPerson();
+                    channelPerson.setCreateDate(LocalDateTime.now());
+                    channelPerson.setPersonId(person.getPersonId());
+                    channelPerson.setChannelId(channel.get(0).getChannelId());
+                    channelPerson.setStatus(CommConstant.STATUS_NORMAL);
+                    taChannelPersonService.save(channelPerson);
+                }else {
+                    return ResponseBean.error("渠道码错误", ResponseBean.ERROR_UNAVAILABLE);
+                }
+
+            }else {
+                QueryWrapper<TaChannelPerson>channelPersonQueryWrapper = new QueryWrapper<>();
+                channelPersonQueryWrapper.eq("person_id",person.getPersonId());
+                List<TaChannelPerson> taChannelPerson = taChannelPersonService.list(channelPersonQueryWrapper);
+                if (taChannelPerson.size()>0){
+                    for(int i=0;i<taChannelPerson.size();i++){
+                        taChannelPerson.get(i).setStatus(CommConstant.STATUS_DELETE);
+                    }
+                    taChannelPersonService.updateBatchById(taChannelPerson);
+                }
+            }
+            person.setPersonType(personType);
+            if (taPersonService.updateById(person)){
+                responseBean.addSuccess(person);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 获取名片详情
+     * @return
+     */
+    @GetMapping("/wx/agent/recommend/mine")
+    public ResponseBean getAgentIRecommend(@RequestParam(defaultValue = "1") int pageNumber,
+                                           @RequestParam(defaultValue = "10") int pageSize, HttpServletRequest request) {
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        QueryWrapper<TaPerson>queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("recommend_agent",person.getPersonId());
+        queryWrapper.eq("person_type", CommConstant.PERSON_ESTATE_AGENT);
+        queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+        Page<TaPerson>page = new Page<>();
+        page.setPages(pageNumber);
+        page.setCurrent(pageNumber);
+        page.setSize(pageSize);
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaPerson>data = taPersonService.page(page,queryWrapper);
+        responseBean.addSuccess(data);
+
+        return responseBean;
+    }
+
+    /**
+     * 获取当前用户
+     * @param request
+     * @return
+     */
+    @GetMapping("/wx/user/current")
+    public ResponseBean getWxCurrentPerson(HttpServletRequest request) {
+        String personId = getPersonId(request);
+        TaPerson taPerson = taPersonService.getById(personId);
+        if (null == taPerson || taPerson.getStatus() != CommConstant.STATUS_NORMAL) {
+            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_AUTH_EXPIRED);
+        }
+
+        return ResponseBean.success(taPerson);
+    }
+
+    
+    /**
+     * 微信添加人员添加城市
+     * @param params
+     * @param request
+     * @return
+     */
+    @PutMapping("/wx/person/city")
+    public ResponseBean updatePersonCity(@RequestBody String params, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        JSONObject jsonObject = JSONObject.parseObject(params);
+        String lat = jsonObject.getString("lat");
+        String lon = jsonObject.getString("lon");
+        String location = lon+","+lat;
+        RestTemplate restTemplate = new RestTemplate();
+        String result = restTemplate.getForObject("https://restapi.amap.com/v3/geocode/regeo?key="+ CommConstant.GD_KEY + "&location=" +location+ "&output=json", String.class);
+        JSONObject resultJson = JSONObject.parseObject(result);
+        if (!resultJson.getString("status").equals(CommConstant.STATUS_NORMAL)){
+            String adcode =  resultJson.getJSONObject("regeocode").getJSONObject("addressComponent").getString("adcode");
+            String cityName =  resultJson.getJSONObject("regeocode").getJSONObject("addressComponent").getString("city");
+            adcode = adcode.substring(0,adcode.length()-2) + "00";
+            person.setCity(adcode);
+            taPersonService.updateById(person);
+            Map<Object,Object> data = new HashMap<>();
+            data.put("cityName",cityName);
+            data.put("cityCode",adcode);
+            responseBean.addSuccess(data);
+            return responseBean;
+        }
+        responseBean.addError("未找到城市");
+        return responseBean;
+    }
 
 }

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

@@ -80,14 +80,14 @@ public class TaPersonVisitRecordController extends BaseController {
      */
     @RequestMapping(value="/wx/taPersonVisitRecord",method= RequestMethod.POST)
     public ResponseBean taPersonVisitRecordAdd(@RequestBody TaPersonVisitRecord taPersonVisitRecord, HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
         taPersonVisitRecord.setActivity(taPersonVisitRecord.getPropertyName());
-        Integer eventProperties = taEventPropertiesService.isEventExist(taPersonVisitRecord.getTargetId(),taPersonVisitRecord.getEventType(),taPersonVisitRecord.getActivity());
+        Integer eventProperties = taEventPropertiesService.isEventExist(taPersonVisitRecord.getTargetId(),taPersonVisitRecord.getEventType(),taPersonVisitRecord.getActivity(), getOrgId(request));
         if(eventProperties<=0){
             TaEventProperties taEventProperty = new TaEventProperties();
             taEventProperty.setBuildingId(taPersonVisitRecord.getTargetId());
@@ -97,6 +97,7 @@ public class TaPersonVisitRecordController extends BaseController {
             taEventProperty.setStatus(CommConstant.STATUS_NORMAL);
             taEventProperty.setBuildingId(taPersonVisitRecord.getBuildingId());
             taEventProperty.setEventType(taPersonVisitRecord.getEventType());
+            taEventProperty.setOrgId(getOrgId(request));
             if (!taEventPropertiesService.save(taEventProperty)){
                 return ResponseBean.error("新增失败",ResponseBean.ERROR_UNAVAILABLE);
             }
@@ -108,6 +109,7 @@ public class TaPersonVisitRecordController extends BaseController {
         if(!StringUtils.isEmpty(taPersonVisitRecord.getBuildingId())){
             QueryWrapper<TaBuildingIntention> intentionQueryWrapper = new QueryWrapper<>();
             intentionQueryWrapper.eq("building_id",taPersonVisitRecord.getBuildingId());
+            intentionQueryWrapper.eq("org_id", getOrgId(request));
             intentionQueryWrapper.eq("event_code",taPersonVisitRecord.getEvent());
             List<TaBuildingIntention>list = buildingIntentionService.list(intentionQueryWrapper);
             if (list.size()>0){
@@ -121,6 +123,7 @@ public class TaPersonVisitRecordController extends BaseController {
                 intentionRecord.setEventId(buildingIntention.getEventId());
                 intentionRecord.setEventName(buildingIntention.getEventName());
                 intentionRecord.setIntention(buildingIntention.getIntention());
+                intentionRecord.setOrgId(getOrgId(request));
                 intentionRecord.setPersonId(person.getPersonId());
                 intentionRecord.setPersonName(person.getNickname());
                 intentionRecord.setStatus(CommConstant.STATUS_NORMAL);
@@ -197,4 +200,25 @@ public class TaPersonVisitRecordController extends BaseController {
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
     }
+    
+    /**
+     * 盘客工具分页获取访问记录
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/taPersonVisitRecord",method= RequestMethod.GET)
+    public ResponseBean wxPersonVisitRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                @RequestParam(value = "customerId") String customerId){
+        try {
+            //使用分页插件
+            IPage<TaPersonVisitRecord> pg = new Page<>(pageNum, pageSize);
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getPersonVisitRecordList(pg, customerId);
+            return ResponseBean.success(result);
+        }catch (Exception e){
+            logger.error("taPersonVisitRecordList -=- {}",e.toString());
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
 }

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

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 
 /**
@@ -57,7 +58,7 @@ public class TaPointsExchangeController extends BaseController {
                                              @RequestParam(value ="startVerifyDate",required = false) String startVerifyDate,
                                              @RequestParam(value ="endVerifyDate",required = false) String endVerifyDate,
                                              @RequestParam(value ="status",required = false) Integer status,
-                                             @RequestParam(value ="tel",required = false) String tel){
+                                             @RequestParam(value ="tel",required = false) String tel, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -72,6 +73,7 @@ public class TaPointsExchangeController extends BaseController {
             taPointsExchange.setEndVerifyDate(endVerifyDate);
             taPointsExchange.setStatus(status);
             taPointsExchange.setTel(tel);
+            taPointsExchange.setOrgId(getOrgId(request));
             
             responseBean = iTaPointsExchangeService.selectList(pageNum,pageSize,taPointsExchange);
 
@@ -93,6 +95,7 @@ public class TaPointsExchangeController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             if (null != taPointsExchange.getStatus() && !taPointsExchange.getStatus().equals(CommConstant.STATUS_NORMAL)){
+                taPointsExchange.setVerifyDate(LocalDateTime.now());
                 taPointsExchange.setStatus(CommConstant.STATUS_NORMAL);
             }
             if (iTaPointsExchangeService.updateById(taPointsExchange)){
@@ -209,14 +212,14 @@ public class TaPointsExchangeController extends BaseController {
      * @return
      */
     @RequestMapping(value="/wx/taPointsExchange",method= RequestMethod.GET)
-    public ResponseBean wxPointsExchangeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean wxPointsExchangeList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                              @RequestParam(value = "buildingId", required = false) String buildingId,
                                              @RequestParam(value = "personId", required = false) String personId){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-            IPage<TaPointsExchange> pg = new Page<>(pageNum, pageSize);
+            IPage<TaPointsExchange> pg = new Page<>(pageNumber, pageSize);
             QueryWrapper<TaPointsExchange> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq(null != personId, "person_id", personId);
             queryWrapper.eq(null != buildingId, "building_id",buildingId);

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

@@ -59,7 +59,7 @@ public class TaPointsRecordsController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taPointsRecords",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taPointsRecords",method= RequestMethod.GET)
     public ResponseBean taPointsRecordsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
@@ -79,12 +79,75 @@ public class TaPointsRecordsController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 分页查询列表
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/taPointsRecords",method= RequestMethod.GET)
+    public ResponseBean taWxPointsRecordsList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                              HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            String openid = getOpenId(request);
+            Integer orgId = getOrgId(request);
+            List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+            if (null == taPersons || taPersons.size() != 1) {
+                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            TaPerson person = taPersons.get(0);
+            //使用分页插件
+            IPage<TaPointsRecords> pg = new Page<>(pageNumber, pageSize);
+            QueryWrapper<TaPointsRecords> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("person_id",person.getPersonId());
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaPointsRecords> result = iTaPointsRecordsService.page(pg, queryWrapper);
+            for(int i = 0;i<result.getRecords().size();i++){
+                switch (result.getRecords().get(i).getChangeType()){
+                    case CommConstant.POINTS_CHANGE_GOODS:
+                        result.getRecords().get(i).setRecordName("兑换商品");
+                        break;
+                    case CommConstant.POINTS_CHANGE_SHARE_POSTER:
+                        result.getRecords().get(i).setRecordName("分享海报");
+                        break;
+                    case CommConstant.POINTS_CHANGE_CHECKIN:
+                        result.getRecords().get(i).setRecordName("签到");
+                        break;
+                    case CommConstant.POINTS_CHANGE_RECOMMEND_CUSTOMER:
+                        result.getRecords().get(i).setRecordName("推荐客户");
+                        break;
+                    case CommConstant.POINTS_CHANGE_SIGNUP_AGENT:
+                        result.getRecords().get(i).setRecordName("授权手机号");
+                        break;
+                    case CommConstant.POINTS_CHANGE_GROUP:
+                        result.getRecords().get(i).setRecordName("拼团");
+                        break;
+                    case CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN:
+                        result.getRecords().get(i).setRecordName("活动签到");
+                        break;
+                    case CommConstant.POINTS_CHANGE_DOCUMENT_VERIFY:
+                        result.getRecords().get(i).setRecordName("资料审核");
+                        break;
+                }
+            }
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPointsRecordsList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 保存对象
      * @param taPointsRecords 实体对象
      * @return
      */
-    @RequestMapping(value="/taPointsRecords",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/taPointsRecords",method= RequestMethod.POST)
     public ResponseBean taPointsRecordsAdd(@RequestBody TaPointsRecords taPointsRecords){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -106,7 +169,7 @@ public class TaPointsRecordsController extends BaseController {
      * @param id  实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taPointsRecords/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/taPointsRecords/{id}", method= RequestMethod.DELETE)
     public ResponseBean taPointsRecordsDelete(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -129,7 +192,7 @@ public class TaPointsRecordsController extends BaseController {
      * @param taPointsRecords 实体对象
      * @return
      */
-    @RequestMapping(value="/taPointsRecords/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/taPointsRecords/{id}",method= RequestMethod.PUT)
     public ResponseBean taPointsRecordsUpdate(@PathVariable Integer id,
                                         @RequestBody TaPointsRecords taPointsRecords){
         ResponseBean responseBean = new ResponseBean();
@@ -152,7 +215,7 @@ public class TaPointsRecordsController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taPointsRecords/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taPointsRecords/{id}",method= RequestMethod.GET)
     public ResponseBean taPointsRecordsGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -165,34 +228,34 @@ public class TaPointsRecordsController extends BaseController {
         return responseBean;
     }
     
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/wx/taPointsRecords",method= RequestMethod.GET)
-    public ResponseBean wxPointsRecordsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                            HttpServletRequest request){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            String openid = JWTUtils.getSubject(request);
-            TaPerson taPerson = taPersonService.getPersonsByOpenId(openid).get(0);
-            //使用分页插件
-            IPage<TaPointsRecords> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaPointsRecords> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("person_id",taPerson.getPersonId());
-            queryWrapper.orderByDesc("create_date");
-            IPage<TaPointsRecords> result = iTaPointsRecordsService.page(pg, queryWrapper);
-            responseBean.addSuccess(result);
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taPointsRecordsList -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
+//    /**
+//     * 分页查询列表
+//     * @param pageNum
+//     * @param pageSize
+//     * @return
+//     */
+//    @RequestMapping(value="/wx/taPointsRecords",method= RequestMethod.GET)
+//    public ResponseBean wxPointsRecordsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+//                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+//                                            HttpServletRequest request){
+//        ResponseBean responseBean = new ResponseBean();
+//        try {
+//            String openid = getOpenId(request);
+//            TaPerson taPerson = taPersonService.getPersonsByOpenId(openid).get(0);
+//            //使用分页插件
+//            IPage<TaPointsRecords> pg = new Page<>(pageNum, pageSize);
+//            QueryWrapper<TaPointsRecords> queryWrapper = new QueryWrapper<>();
+//            queryWrapper.eq("person_id",taPerson.getPersonId());
+//            queryWrapper.orderByDesc("create_date");
+//            IPage<TaPointsRecords> result = iTaPointsRecordsService.page(pg, queryWrapper);
+//            responseBean.addSuccess(result);
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            logger.error("taPointsRecordsList -=- {}",e.toString());
+//            responseBean.addError(e.getMessage());
+//        }
+//        return responseBean;
+//    }
 
     /**
      * 分页查询列表
@@ -200,7 +263,7 @@ public class TaPointsRecordsController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/admin/taPointsRecords/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/mine/taPointsRecords/{id}",method= RequestMethod.GET)
     public ResponseBean CustomerPointsRecordsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                             @PathVariable(value = "id") String id){

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

@@ -10,6 +10,10 @@ import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TdCity;
 import com.huiju.estateagents.service.ITdCityService;
 import com.huiju.estateagents.service.ITaPolicyService;
+import io.swagger.annotations.Api;
+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;
@@ -35,6 +39,7 @@ import java.time.LocalDateTime;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "政策维护", tags = "政策维护")
 public class TaPolicyController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaPolicyController.class);
@@ -52,10 +57,17 @@ public class TaPolicyController extends BaseController {
      * @param pageSize
      * @return
      */
+    @ApiOperation(value = "后台政策维护列表", notes = "后台政策维护列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "cityId", paramType = "query",value = "城市ID")
+    })
     @RequestMapping(value="/admin/taPolicy",method= RequestMethod.GET)
     public ResponseBean taPolicyList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                     @RequestParam(value ="cityId") Integer cityId){
+                                     @RequestParam(value ="cityId", required = false) Integer cityId,
+                                     HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -64,6 +76,7 @@ public class TaPolicyController extends BaseController {
             queryWrapper.eq(null != cityId,"city_id",cityId);
             queryWrapper.orderByDesc("weight", "create_date");
             queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.eq("org_id", getOrgId(request));
 
             IPage<TaPolicy> result = iTaPolicyService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
@@ -80,17 +93,24 @@ public class TaPolicyController extends BaseController {
      * @param pageSize
      * @return
      */
+    @ApiOperation(value = "微信政策维护列表", notes = "微信政策维护列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "cityId", paramType = "query",value = "城市ID")
+    })
     @RequestMapping(value="/wx/taPolicy",method= RequestMethod.GET)
-    public ResponseBean taPolicyListCity(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean taPolicyListCity(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                         @RequestParam(value ="cityId", required = false) Integer cityId){
+                                         @RequestParam(value ="cityId", required = false) Integer cityId,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-            IPage<TaPolicy> pg = new Page<>(pageNum, pageSize);
+            IPage<TaPolicy> pg = new Page<>(pageNumber, pageSize);
             QueryWrapper<TaPolicy> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("city_id",cityId);
             queryWrapper.eq("publish_status",CommConstant.IS_PUBLISH);
+            queryWrapper.eq("org_id",getOrgId(request));
             queryWrapper.orderByDesc("weight", "create_date");
             queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
 
@@ -108,6 +128,10 @@ public class TaPolicyController extends BaseController {
      * @param taPolicy 实体对象
      * @return
      */
+    @ApiOperation(value = "后台政策维护保存", notes = "后台政策维护保存")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "TaPolicy", name = "taPolicy", paramType = "body",value = "政策数据")
+    })
     @RequestMapping(value="/admin/taPolicy",method= RequestMethod.POST)
     public ResponseBean taPolicyAdd(@RequestBody TaPolicy taPolicy, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -115,7 +139,7 @@ public class TaPolicyController extends BaseController {
 
             if(taPolicy.getPublishStatus().equals(CommConstant.IS_PUBLISH)){
                 taPolicy.setPublishDate(LocalDateTime.now());
-                String personId = JWTUtils.getSubject(request);
+                String personId = getPersonId(request);
                 taPolicy.setPublishUser(personId);
             }
 
@@ -124,6 +148,7 @@ public class TaPolicyController extends BaseController {
 
             taPolicy.setStatus(1);
             taPolicy.setCreateDate(LocalDateTime.now());
+            taPolicy.setOrgId(getOrgId(request));
 
             if (iTaPolicyService.save(taPolicy)){
                 responseBean.addSuccess(taPolicy);
@@ -141,6 +166,10 @@ public class TaPolicyController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
+    @ApiOperation(value = "后台政策维护删除", notes = "后台政策维护删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "path",value = "政策数据ID")
+    })
     @ResponseBody
     @RequestMapping(value="/admin/taPolicy/{id}", method= RequestMethod.DELETE)
     public ResponseBean taPolicyDelete(@PathVariable Integer id){
@@ -166,6 +195,11 @@ public class TaPolicyController extends BaseController {
      * @param taPolicy 实体对象
      * @return
      */
+    @ApiOperation(value = "后台政策维护修改", notes = "后台政策维护修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "path",value = "政策数据ID"),
+            @ApiImplicitParam(dataType = "TaPolicy", name = "taPolicy", paramType = "body",value = "政策数据")
+    })
     @RequestMapping(value="/admin/taPolicy/{id}",method= RequestMethod.PUT)
     public ResponseBean taPolicyUpdate(@PathVariable Integer id,
                                         @RequestBody TaPolicy taPolicy,
@@ -176,12 +210,13 @@ public class TaPolicyController extends BaseController {
 
             if(taPolicy.getPublishStatus().equals(CommConstant.IS_PUBLISH)){
                 taPolicy.setPublishDate(LocalDateTime.now());
-                String personId = JWTUtils.getSubject(request);
+                String personId = getPersonId(request);
                 taPolicy.setPublishUser(personId);
             }
 
             TdCity tdCity = iTdCityService.getById(taPolicy.getCityId());
             taPolicy.setCityName(tdCity.getName());
+            taPolicy.setOrgId(getOrgId(request));
 
             if (iTaPolicyService.updateById(taPolicy)){
                 responseBean.addSuccess(taPolicy);
@@ -199,6 +234,10 @@ public class TaPolicyController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
+    @ApiOperation(value = "后台政策维护查询", notes = "后台政策维护查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "path",value = "政策数据ID")
+    })
     @RequestMapping(value="/admin/taPolicy/{id}",method= RequestMethod.GET)
     public ResponseBean taPolicyGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
@@ -215,11 +254,20 @@ public class TaPolicyController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
+    @ApiOperation(value = "微信政策维护查询", notes = "微信政策维护查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "path",value = "政策数据ID")
+    })
     @RequestMapping(value="/wx/taPolicy/{id}",method= RequestMethod.GET)
     public ResponseBean taPolicyGetWx(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaPolicyService.getById(id));
+            TaPolicy policy = iTaPolicyService.getById(id);
+            if (null != policy) {
+                policy.setPvNum(policy.getPvNum() + 1);
+                iTaPolicyService.updateById(policy);
+            }
+            responseBean.addSuccess(policy);
         }catch (Exception e){
             logger.error("taPolicyDelete -=- {}",e.toString());
             responseBean.addError(e.getMessage());

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

@@ -0,0 +1,204 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaBuilding;
+import com.huiju.estateagents.entity.TaPoster;
+import com.huiju.estateagents.service.ITaBuildingService;
+import com.huiju.estateagents.service.TaPosterService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 分享海报表  前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-21
+ */
+@RestController
+@RequestMapping("/api")
+public class TaPosterController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaPosterController.class);
+
+    @Autowired
+    public TaPosterService iPosterService;
+
+    @Autowired
+    private ITaBuildingService iTaBuildingService;
+
+
+    /**
+     * 分页查询列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/poster", method = RequestMethod.GET)
+    public ResponseBean posterList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaPoster> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaPoster> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaPoster> result = iPosterService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("posterList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     *
+     * @param poster 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/admin/poster", method = RequestMethod.POST)
+    public ResponseBean posterAdd(@RequestBody TaPoster poster, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            poster.setStatus(CommConstant.STATUS_NORMAL);
+            poster.setOrgId(getOrgId(request));
+            poster.setCreateDate(LocalDateTime.now());
+            if (iPosterService.save(poster)) {
+
+                // 为了兼容 小程序3.0 -> v3.4的后端
+                updateBuildingPoster(poster);
+                responseBean.addSuccess(poster);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("posterAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 项目添加海报的时候，往项目的 poster 字段插入一张图片
+     * 为了兼容 小程序3.0 -> v3.4的后端
+     * @param poster
+     */
+    private void updateBuildingPoster(TaPoster poster) {
+        // 项目添加海报的时候，往项目的 poster 字段插入一张图片
+        // 为了兼容 小程序3.0 -> v3.4的后端
+        if ("building".equals(poster.getTargetType())) {
+            UpdateWrapper<TaBuilding> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("building_id", poster.getTargetId());
+            updateWrapper.set("poster", poster.getPosterImg());
+            iTaBuildingService.update(updateWrapper);
+        }
+    }
+
+    /**
+     * 根据id删除对象
+     *
+     * @param id 实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value = "/poster/{id}", method = RequestMethod.DELETE)
+    public ResponseBean posterDelete(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iPosterService.removeById(id)) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("posterDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @param id     实体ID
+     * @param poster 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/admin/poster/{id}", method = RequestMethod.PUT)
+    public ResponseBean posterUpdate(@PathVariable Integer id,
+                                     @RequestBody TaPoster poster) {
+        ResponseBean responseBean = new ResponseBean();
+        poster.setPosterId(id);
+        try {
+            if (iPosterService.updateById(poster)) {
+
+                // 为了兼容 小程序3.0 -> v3.4的后端
+                updateBuildingPoster(poster);
+                responseBean.addSuccess(poster);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("posterUpdate -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 查询对象
+     */
+    @RequestMapping(value = "/admin/poster", method = RequestMethod.GET)
+    public ResponseBean posterGet(@RequestParam String targetId,@RequestParam String targetType ) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iPosterService.getPostersForTarget(targetId,targetType));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("posterDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 查询对象
+     */
+    @RequestMapping(value = "/admin/used/poster", method = RequestMethod.GET)
+    public ResponseBean posterUsed(@RequestParam String targetId,@RequestParam String targetType ) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iPosterService.getUsedPostersForTarget(targetId,targetType));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("posterDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,149 @@
+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.TaPosterUsed;
+import com.huiju.estateagents.service.ITaPosterUsedService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    *  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-10-28
+ */
+@RestController
+@RequestMapping("/")
+public class TaPosterUsedController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaPosterUsedController.class);
+
+    @Autowired
+    public ITaPosterUsedService iTaPosterUsedService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taPosterUsed",method= RequestMethod.GET)
+    public ResponseBean taPosterUsedList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaPosterUsed> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaPosterUsed> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaPosterUsed> result = iTaPosterUsedService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPosterUsedList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taPosterUsed 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taPosterUsed",method= RequestMethod.POST)
+    public ResponseBean taPosterUsedAdd(@RequestBody TaPosterUsed taPosterUsed){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaPosterUsedService.save(taPosterUsed)){
+                responseBean.addSuccess(taPosterUsed);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPosterUsedAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taPosterUsed/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taPosterUsedDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaPosterUsedService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPosterUsedDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taPosterUsed 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taPosterUsed/{id}",method= RequestMethod.PUT)
+    public ResponseBean taPosterUsedUpdate(@PathVariable Integer id,
+                                        @RequestBody TaPosterUsed taPosterUsed){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaPosterUsedService.updateById(taPosterUsed)){
+                responseBean.addSuccess(taPosterUsed);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPosterUsedUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taPosterUsed/{id}",method= RequestMethod.GET)
+    public ResponseBean taPosterUsedGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaPosterUsedService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPosterUsedDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -1,6 +1,9 @@
 package com.huiju.estateagents.controller;
 
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,11 +11,20 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaRecommendCustomer;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.event.EventBus;
+import com.huiju.estateagents.excel.*;
+import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
+import com.huiju.estateagents.mapper.TaPersonBuildingMapper;
+import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
+import com.huiju.estateagents.service.TaChannelPersonService;
+import com.huiju.estateagents.service.TaChannelService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.bind.annotation.*;
@@ -21,7 +33,12 @@ import com.huiju.estateagents.base.BaseController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -33,6 +50,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "项目类型", tags = "项目类型")
 public class TaRecommendCustomerController extends BaseController {
 
     @Autowired
@@ -44,6 +62,19 @@ public class TaRecommendCustomerController extends BaseController {
     @Resource
     private ApplicationContext applicationContext;
 
+    @Autowired
+    private TaChannelService taChannelService;
+
+    @Autowired
+    private TaChannelPersonService taChannelPersonService;
+
+    @Autowired
+    private TaRecommendCustomerMapper taRecommendCustomerMapper;
+
+    @Autowired
+    private TaPersonBuildingMapper taPersonBuildingMapper;
+
+
     /**
      * 我的客户列表
      * @param pageNumber
@@ -53,12 +84,18 @@ public class TaRecommendCustomerController extends BaseController {
      * @return
      */
     @GetMapping("/wx/customer/list")
+    @ApiOperation(value = "查询我的客户列表", notes = "查询我的客户列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNumber", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "keywords", paramType = "query",value = "搜索关键字，目前仅支持姓名")
+    })
     public ResponseBean getMyCustList(@RequestParam int pageNumber, @RequestParam int pageSize, String keywords, HttpServletRequest request) {
         if (pageNumber < 0 || pageSize < 0) {
             return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         return taRecommendCustomerService.getMyCustList(openid, keywords, pageNumber, pageSize);
     }
 
@@ -68,6 +105,10 @@ public class TaRecommendCustomerController extends BaseController {
      * @return
      */
     @GetMapping("/wx/customer/{id}")
+    @ApiOperation(value = "查询客户详情", notes = "查询客户详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, name = "id", paramType = "path",value = "搜索关键字，目前仅支持姓名")
+    })
     public ResponseBean getCustDetail(@PathVariable String id) {
         if (null == id || "".equals(id.trim())) {
             return ResponseBean.error("请求地址错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
@@ -82,6 +123,10 @@ public class TaRecommendCustomerController extends BaseController {
      * @return
      */
     @PostMapping("/wx/customer/edit")
+    @ApiOperation(value = "客户编辑", notes = "客户编辑")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, name = "id", paramType = "path",value = "搜索关键字，目前仅支持姓名")
+    })
     public ResponseBean updateCust(@RequestBody String paramStr) {
         return taRecommendCustomerService.updateCustByJSON(paramStr);
     }
@@ -94,8 +139,9 @@ public class TaRecommendCustomerController extends BaseController {
      */
     @PostMapping("/wx/customer/new")
     public ResponseBean recommendCust(@RequestBody String paramStr, HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
-        return taRecommendCustomerService.recommendCust(paramStr, openid);
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        return taRecommendCustomerService.recommendCust(paramStr, openid,orgId);
     }
 
     /**
@@ -106,8 +152,9 @@ public class TaRecommendCustomerController extends BaseController {
      */
     @PostMapping("/wx/customer/report")
     public ResponseBean reportCust(@RequestBody String paramStr, HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
-        return taRecommendCustomerService.reportCust(paramStr, openid);
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        return taRecommendCustomerService.reportCust(paramStr, openid,orgId);
     }
 
     @PostMapping("/wx/customer/recommend")
@@ -115,7 +162,7 @@ public class TaRecommendCustomerController extends BaseController {
                                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                                   @RequestParam(value ="buildingId") String buildingId,
                                                   HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
+        String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -130,9 +177,61 @@ public class TaRecommendCustomerController extends BaseController {
     }
 
     @GetMapping("/wx/customer/myReport")
-    public ResponseBean getCustomerIReport (@RequestParam(value ="personId") String personId,
+    public ResponseBean getCustomerIReport (HttpServletRequest request,
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        try{
+            IPage<TaRecommendCustomer>pg = new Page<>(pageNumber,pageSize);
+            QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("realty_consultant",person.getPersonId());
+            queryWrapper.eq("report_recommend_status",CommConstant.REPORTED);
+            queryWrapper.eq("status",CommConstant.CUSTOMER_REPORT);
+            queryWrapper.orderByDesc("create_date");
+            IPage<TaRecommendCustomer>result = taRecommendCustomerService.page(pg,queryWrapper);
+            return ResponseBean.success(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    @GetMapping("/wx/customer/myCustomer")
+    public ResponseBean getMyCustomer (     @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            HttpServletRequest request){
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+
+        try{
+            IPage<TaRecommendCustomer>pg = new Page<>(pageNumber,pageSize);
+            QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("realty_consultant",person.getPersonId());
+           // queryWrapper.eq("report_recommend_status",CommConstant.REPORTED);
+            queryWrapper.gt("status",CommConstant.STATUS_UNACCALIMED);
+            queryWrapper.orderByDesc("create_date");
+            IPage<TaRecommendCustomer>result = taRecommendCustomerService.page(pg,queryWrapper);
+            return ResponseBean.success(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+
+    @GetMapping("/wx/customer/myInviteAgent")
+    public ResponseBean getMyInviteAgent (@RequestParam(value ="personId") String personId,
+                                       @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         try{
             IPage<TaRecommendCustomer>pg = new Page<>(pageNumber,pageSize);
             QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
@@ -147,9 +246,11 @@ public class TaRecommendCustomerController extends BaseController {
         }
     }
 
-    // 客户列表
+
+    // 客户列表 公客/私客
     @GetMapping("/admin/customer/recommend")
-    public ResponseBean getCustomerList (@RequestParam(value ="name",required = false) String name,
+    public ResponseBean getCustomerList (HttpServletRequest request,
+                                         @RequestParam(value ="name",required = false) String name,
                                          @RequestParam(value ="tel",required = false) String tel,
                                          @RequestParam(value ="buildingId",required = false) String buildingId,
                                          @RequestParam(value ="consultName",required = false) String consultName,
@@ -158,9 +259,23 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                          @RequestParam(value ="entryType",required = false) String entryType,
                                          @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
-                                         @RequestParam(value = "sex",required = false)Integer sex){
+                                         @RequestParam(value = "sex",required = false)Integer sex,
+                                         @RequestParam(value = "customerType") String customerType,// public 公  private 私
+                                         @RequestParam(value = "status",required = false) Integer status){
         try{
-            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex));
+
+            // TODO 目前如果是公客，就取当前操作人员的 buildingId
+//            if ("public".equals(customerType)) {
+//                Map<String,Object> map = JWTUtils.getUserIdAndOrgId(request);
+//                String userId = (String) map.get("userId");
+//                QueryWrapper<TaPersonBuilding> queryWrapper = new QueryWrapper<>();
+//                queryWrapper.eq("user_id", userId);
+//                queryWrapper.orderByDesc("create_date");
+//                queryWrapper.last("limit 1");
+//                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)));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -170,18 +285,19 @@ public class TaRecommendCustomerController extends BaseController {
 
     //推荐客户列表
     @GetMapping("/admin/customer/recommend/recommender")
-    public ResponseBean getRecCustomerList (@RequestParam(value ="name",required = false) String name,
+    public ResponseBean getRecCustomerList (HttpServletRequest request,
+                                         @RequestParam(value ="name",required = false) String name,
                                          @RequestParam(value ="tel",required = false) String tel,
                                          @RequestParam(value ="buildingId",required = false) String buildingId,
-                                         @RequestParam(value ="recommendName",required = false) String recommendName,
-                                         @RequestParam(value ="recommendTel",required = false) String recommendTel,
+                                         @RequestParam(value ="consultName",required = false) String consultName,
+                                         @RequestParam(value ="consultTel",required = false) String consultTel,
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                          @RequestParam(value ="entryType",required = false) String entryType,
                                          @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
                                          @RequestParam(value = "sex",required = false)Integer sex){
         try{
-            return ResponseBean.success(taRecommendCustomerService.getRecCustomerList(pageNumber,pageSize,buildingId,name,tel,recommendName,recommendTel,entryType,verifyStatus,sex));
+            return ResponseBean.success(taRecommendCustomerService.getRecCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, getOrgId(request)));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -199,9 +315,10 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                          @RequestParam(value ="entryType",required = false) String entryType,
                                          @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
-                                         @RequestParam(value = "sex",required = false)Integer sex){
+                                         @RequestParam(value = "sex",required = false)Integer sex, HttpServletRequest request){
+        Integer orgid = getOrgId(request);
         try{
-            return ResponseBean.success(taRecommendCustomerService.getRepCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex));
+            return ResponseBean.success(taRecommendCustomerService.getRepCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, orgid));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -209,14 +326,22 @@ public class TaRecommendCustomerController extends BaseController {
     }
 
 
-    //独立经纪人列表
+    /**
+     * 经纪人列表
+     * @param name
+     * @param tel
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
     @GetMapping("/admin/customer/agents")
-    public ResponseBean getIndependentAgents (@RequestParam(value ="name",required = false) String name,
+    public ResponseBean getIndependentAgents (HttpServletRequest request,
+                                              @RequestParam(value ="name",required = false) String name,
                                             @RequestParam(value ="tel",required = false) String tel,
                                             @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         try{
-            return ResponseBean.success(taRecommendCustomerService.getIndependentAgents(pageNumber,pageSize,name,tel));
+            return ResponseBean.success(taRecommendCustomerService.getIndependentAgents(pageNumber,pageSize,name,tel, getOrgId(request)));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -225,26 +350,45 @@ public class TaRecommendCustomerController extends BaseController {
 
 
     @GetMapping("/admin/customer/recommend/{customerId}")
-    public ResponseBean getCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize, @PathVariable String customerId){
-        String buildingId="";
+    public ResponseBean getCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize, @PathVariable String customerId,HttpServletRequest request){
+        Integer orgId = getOrgId(request);
         try{
-            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,customerId,buildingId));
+            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,customerId,orgId));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
+    @GetMapping("/wx/customer/recommend/mine")
+    public ResponseBean getWxCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize,HttpServletRequest request){
+        Integer orgId =getOrgId(request);
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        try{
+            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,person.getPersonId(),orgId));
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+
+
         /**
      * 修改对象
      * @param taRecommendCustomer 实体对象
      * @return
      */
-    @RequestMapping(value="/wx/customer/recommend/edit/{id}",method= RequestMethod.PUT)
-    public ResponseBean taRecommendCustomerUpdateWx(@PathVariable String id,
+    @RequestMapping(value="/wx/customer/recommend/edit/{customerId}",method= RequestMethod.PUT)
+    public ResponseBean taRecommendCustomerUpdateWx(@PathVariable String customerId,
                                         @RequestBody TaRecommendCustomer taRecommendCustomer){
         ResponseBean responseBean = new ResponseBean();
-        taRecommendCustomer.setCustomerId(id);
+        taRecommendCustomer.setCustomerId(customerId);
         try {
             if (taRecommendCustomerService.updateById(taRecommendCustomer)){
                 responseBean.addSuccess(taRecommendCustomer);
@@ -280,8 +424,31 @@ public class TaRecommendCustomerController extends BaseController {
         return responseBean;
     }
 
-    @RequestMapping(value = "/wx/customer/recommend/get/{id}", method = RequestMethod.GET)
-    public ResponseBean getSingleCustomer(@PathVariable(value = "id") String customerId) {
+//    /**
+//     * 修改对象
+//     * @param taRecommendCustomer 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/wx/customer/recommend/edit/{id}",method= RequestMethod.PUT)
+//    public ResponseBean taWxRecommendCustomerUpdate(@PathVariable String id,
+//                                                  @RequestBody TaRecommendCustomer taRecommendCustomer){
+//        ResponseBean responseBean = new ResponseBean();
+//        taRecommendCustomer.setCustomerId(id);
+//        try {
+//            if (taRecommendCustomerService.updateById(taRecommendCustomer)){
+//                responseBean.addSuccess(taRecommendCustomer);
+//            }else {
+//                responseBean.addError("fail");
+//            }
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            responseBean.addError(e.getMessage());
+//        }
+//        return responseBean;
+//    }
+
+    @RequestMapping(value = "/wx/customer/recommend/get/{customerId}", method = RequestMethod.GET)
+    public ResponseBean getSingleCustomer(@PathVariable(value = "customerId") String customerId) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(taRecommendCustomerService.getById(customerId));
@@ -307,10 +474,26 @@ public class TaRecommendCustomerController extends BaseController {
 
 
     @GetMapping(value = "/admin/customer/recommend/get/{id}")
-    public ResponseBean getCutomerDetail(@PathVariable String id) {
+    public ResponseBean getCustomerDetail(@PathVariable String id,
+                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id,pageNumber,pageSize));
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    @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) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id));
+            responseBean.addSuccess(taRecommendCustomerService.getPublicCustomerDetail(id,pageNumber,pageSize));
         }catch (Exception e){
             e.printStackTrace();
             responseBean.addError(e.getMessage());
@@ -319,11 +502,12 @@ public class TaRecommendCustomerController extends BaseController {
     }
 
     @GetMapping("/admin/customer/recommend/drift")
-    public ResponseBean getDriftCustomerList (@RequestParam(value ="buildingId",defaultValue = "false") String buildingId,
+    public ResponseBean getDriftCustomerList (HttpServletRequest request,
+                                              @RequestParam(value ="buildingId",defaultValue = "false") String buildingId,
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         try{
-            return ResponseBean.success(taPersonService.getDriftCustomerList(pageNumber,pageSize,buildingId));
+            return ResponseBean.success(taPersonService.getDriftCustomerList(pageNumber,pageSize,buildingId, getOrgId(request)));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -335,24 +519,33 @@ public class TaRecommendCustomerController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/customer/recommend/verify/{id}",method= RequestMethod.PUT)
-    public ResponseBean taRecommendCustomerVerify(@PathVariable String id,@RequestParam Integer verifyStatus, @RequestParam(required = false) String verifyRemark){
+    public ResponseBean taRecommendCustomerVerify(@PathVariable String id,@RequestParam Integer verifyStatus, @RequestParam(required = false) String verifyRemark, HttpServletRequest request){
         if (null == verifyStatus) {
             return ResponseBean.error("审核结果非法", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
-
+        Integer orgId = getOrgId(request);
         ResponseBean responseBean = new ResponseBean();
         try {
             TaRecommendCustomer taRecommendCustomer = taRecommendCustomerService.getById(id);
-            if(taRecommendCustomer.getVerifyStatus().equals(CommConstant.VERIFY_READY) ){
+            if(null == taRecommendCustomer.getVerifyStatus() || 0 == taRecommendCustomer.getVerifyStatus().intValue()){ // taRecommendCustomer.getVerifyStatus().equals(CommConstant.VERIFY_READY)
                 taRecommendCustomer.setVerifyStatus(verifyStatus);
                 if(!StringUtils.isEmpty(verifyRemark)){
                     taRecommendCustomer.setVerifyRemark(verifyRemark);
+                    if(CommConstant.CUSTOMER_REPORT.equals(taRecommendCustomer.getReportRecommendStatus())){
+                        taRecommendCustomer.setRealtyConsultant(taRecommendCustomer.getRecommendPerson());
+                    }
                 }
+
+                // 审核不通过的时候，移除置业顾问选择
+                if (CommConstant.VERIFY_DISAGREE == verifyStatus) {
+                    taRecommendCustomer.setRealtyConsultant(null);
+                }
+
                 if (taRecommendCustomerService.updateById(taRecommendCustomer)){
 
                     // 审核通过增加积分
                     if (CommConstant.VERIFY_AGREE == verifyStatus) {
-                        applicationContext.publishEvent(new EventBus(taRecommendCustomer, EventBus.EventType.RecommendCustomer));
+                        applicationContext.publishEvent(new EventBus(taRecommendCustomer, EventBus.EventType.RecommendCustomer, orgId));
                     }
 
                     responseBean.addSuccess(taRecommendCustomer);
@@ -370,4 +563,267 @@ public class TaRecommendCustomerController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 导出数据(推荐客户列表)
+     */
+    @GetMapping("/admin/customer/recommend/recommender/export")
+    public void export(HttpServletRequest request, HttpServletResponse response) throws IOException {
+//        response.setContentType("application/vnd.ms-excel");
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=推荐客户.xlsx");
+
+        Integer count = taRecommendCustomerService.getRecCustomerExportCount(getOrgId(request));
+
+        Integer pageCode = 0;
+        Integer pageSize = 100;
+        // 总页数
+        Integer pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+        // 设置读取的class
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ExcelRecommendCustomer.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("推荐客户").build();
+        do {
+            List<ExcelRecommendCustomer> recCustomerExport = taRecommendCustomerService.getRecCustomerExport(getOrgId(request), pageCode * pageSize, pageSize);
+            excelWriter.write(recCustomerExport, writeSheet);
+
+            pageCode ++;
+        } while (pageCode <= pageCount);
+
+        /// finish 会帮忙关闭流
+        excelWriter.finish();
+
+    }
+
+
+    /**
+     * 导出数据(报备客户)
+     */
+    @GetMapping("/admin/customer/recommend/report/export")
+    public void reportExport(HttpServletRequest request,
+                             HttpServletResponse response,
+                             @RequestParam(value ="name",required = false) String name,
+                             @RequestParam(value ="tel",required = false) String tel,
+                             @RequestParam(value ="buildingId",required = false) String buildingId,
+                             @RequestParam(value ="consultName",required = false) String consultName,
+                             @RequestParam(value ="consultTel",required = false) String consultTel,
+                             @RequestParam(value ="entryType",required = false) String entryType,
+                             @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
+                             @RequestParam(value = "sex",required = false)Integer sex) throws IOException {
+//        response.setContentType("application/vnd.ms-excel");
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=报备客户.xlsx");
+
+        Integer count = taRecommendCustomerService.getRepCustomerReportCount(buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex,getOrgId(request));
+
+        Integer pageCode = 0;
+        Integer pageSize = 100;
+        // 总页数
+        Integer pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+        // 设置读取的class
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ReporRecommendCustomer.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("报备客户").build();
+        List<ReporRecommendCustomer> recCustomerExport = null;
+        do {
+            recCustomerExport = taRecommendCustomerService.getRepCustomerReportExport(buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, getOrgId(request), pageCode * pageSize, pageSize);
+            excelWriter.write(recCustomerExport, writeSheet);
+
+            pageCode ++;
+        } while (pageCode <= pageCount);
+
+        /// finish 会帮忙关闭流
+        excelWriter.finish();
+
+    }
+
+    /**
+     * 导出数据(经纪人)
+     */
+    @GetMapping("/admin/customer/recommend/agents/export")
+    public void agentsExport(HttpServletRequest request, HttpServletResponse response) throws IOException {
+//        response.setContentType("application/vnd.ms-excel");
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=经纪人.xlsx");
+
+        Integer count = taRecommendCustomerService.getIndependentAgentsCount(getOrgId(request));
+
+        Integer pageCode = 0;
+        Integer pageSize = 100;
+        // 总页数
+        Integer pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+        // 设置读取的class
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), AgentsRecommendCustomer.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("经纪人").build();
+        List<AgentsRecommendCustomer> recCustomerExport = null;
+        do {
+            recCustomerExport = taRecommendCustomerService.getIndependentAgentsExport(getOrgId(request), pageCode * pageSize, pageSize);
+            excelWriter.write(recCustomerExport, writeSheet);
+
+            pageCode ++;
+        } while (pageCode <= pageCount);
+
+        /// finish 会帮忙关闭流
+        excelWriter.finish();
+
+    }
+
+
+
+    // 客户列表 公客/私客
+
+    /**
+     * 导出数据 客户列表 公客/私客
+     * @param request
+     * @param response
+     * @param name
+     * @param tel
+     * @param buildingId
+     * @param consultName
+     * @param consultTel
+     * @param entryType
+     * @param verifyStatus
+     * @param sex
+     * @param customerType
+     * @param status
+     * @throws IOException
+     */
+    @GetMapping("/admin/customer/recommend/export")
+    public void getCustomerExportList (HttpServletRequest request,
+                                         HttpServletResponse response,
+                                         @RequestParam(value ="name",required = false) String name,
+                                         @RequestParam(value ="tel",required = false) String tel,
+                                         @RequestParam(value ="buildingId",required = false) String buildingId,
+                                         @RequestParam(value ="consultName",required = false) String consultName,
+                                         @RequestParam(value ="consultTel",required = false) String consultTel,
+                                         @RequestParam(value ="entryType",required = false) String entryType,
+                                         @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
+                                         @RequestParam(value = "sex",required = false)Integer sex,
+                                         @RequestParam(value = "customerType") String customerType,
+                                         @RequestParam(value = "status",required = false) Integer status) throws IOException { // public 公  private 私
+
+        //        response.setContentType("application/vnd.ms-excel");
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=经纪人.xlsx");
+
+        Integer orgId = getOrgId(request);
+
+        Integer pageCode = 0;
+        Integer pageSize = 100;
+        // 总页数
+        Integer pageCount = 0;
+
+        if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
+            /**
+             * 公客
+             */
+
+            // 设置读取的class
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), PublicCustomerExport.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("客户列表-公客").build();
+
+            Integer count = taRecommendCustomerMapper.getPublicCustomerExportListCount(name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
+            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+            List<PublicCustomerExport> publicList = null;
+            do {
+                publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize, name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
+                excelWriter.write(publicList, writeSheet);
+
+                pageCode ++;
+            } while (pageCode <= pageCount);
+
+            // finish 会帮忙关闭流
+            excelWriter.finish();
+        } else {
+            /**
+             * 私客
+             */
+
+            // 设置读取的class
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), PrivateCustomerExport.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("客户列表-私客").build();
+
+            Integer count = taRecommendCustomerMapper.getCustomerExportListCount(buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status);
+            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+            List<PrivateCustomerExport> privateList = null;
+            do {
+                privateList = taRecommendCustomerMapper.getCustomerExportList(pageCode *  pageSize, pageSize, buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status);
+                excelWriter.write(privateList, writeSheet);
+
+                pageCode ++;
+            } while (pageCode <= pageCount);
+            // finish 会帮忙关闭流
+            excelWriter.finish();
+
+        }
+
+
+    }
+    
+    /**
+     * 查询判客工具下的我的客户人数集合
+     * @param request
+     * @return
+     */
+    @GetMapping("/wx/inventory/customer/statistics")
+    @ApiOperation(value = "查询我的客户人数统计", notes = "查询我的客户人数统计")
+    public ResponseBean getMyCustStatistics(HttpServletRequest request) {
+        String openid = getOpenId(request);
+        return taRecommendCustomerService.getMyCustStatistics(openid);
+    }
+    
+    /**
+     * 分页查询判客工具下的我的客户跟进人集合
+     *  根据type区分  follow 跟进  clinch 成交
+     * @param request
+     * @return
+     */
+    @GetMapping("/wx/inventory/customer/statistics/{type}")
+    @ApiOperation(value = "查询我的客户人数统计", notes = "查询我的客户人数统计")
+    public ResponseBean getMyCustFollows(@PathVariable(value = "type") String type,
+                                         @RequestParam(value = "pageNumber",defaultValue = "0") Integer pageNumber,
+                                         @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value = "name",required = false) String name,
+                                         @RequestParam(value = "phone",required = false) String phone,
+                                         @RequestParam(value = "status",required = false) Integer status,
+                                         @RequestParam(value = "startReportDate",required = false) LocalDateTime startReportDate,
+                                         @RequestParam(value = "endReportDate",required = false) LocalDateTime endReportDate,
+                                         @RequestParam(value = "startArrivalDate",required = false) LocalDateTime startArrivalDate,
+                                         @RequestParam(value = "endArrivalDate",required = false) LocalDateTime endArrivalDate,
+                                         HttpServletRequest request) {
+        String openid = getOpenId(request);
+        return taRecommendCustomerService.getMyCustFollowOrClinch(pageNumber,pageSize,openid,type,name,phone,status,startReportDate,endReportDate,startArrivalDate,endArrivalDate);
+    }
+    
+    /**
+     * 查询盘客工具下我的客户详情
+     * @param request
+     * @return
+     */
+    @GetMapping("/wx/inventory/customer/{customerId}")
+    @ApiOperation(value = "查询客户详情", notes = "查询客户详情")
+    public ResponseBean getMyCustDetail(@PathVariable(value = "customerId") String customerId,HttpServletRequest request) {
+        String openid = getOpenId(request);
+        return taRecommendCustomerService.getMyCustDetail(customerId,openid);
+    }
+    
+    /**
+     * 查询盘客工具下编辑基本信息
+     * @param request
+     * @return
+     */
+    @PutMapping("/wx/inventory/customer/{customerId}")
+    @ApiOperation(value = "编辑客户信息", notes = "编辑客户信息")
+    public ResponseBean updateMyCustDetail(@PathVariable(value = "customerId") String customerId,
+                                           @RequestBody TaRecommendCustomer taRecommendCustomer, HttpServletRequest request) {
+        String openid = getOpenId(request);
+        taRecommendCustomer.setCustomerId(customerId);
+        return taRecommendCustomerService.updateMyCust(taRecommendCustomer,openid);
+    }
 }

src/main/java/com/huiju/estateagents/controller/TaRoleButtonController.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.TaRoleButton;
+import com.huiju.estateagents.service.ITaRoleButtonService;
+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 2019-09-11
+ */
+@RestController
+@RequestMapping("/")
+public class TaRoleButtonController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaRoleButtonController.class);
+
+    @Autowired
+    public ITaRoleButtonService iTaRoleButtonService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taRoleButton",method= RequestMethod.GET)
+    public ResponseBean taRoleButtonList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaRoleButton> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaRoleButton> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaRoleButton> result = iTaRoleButtonService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleButtonList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taRoleButton 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taRoleButton",method= RequestMethod.POST)
+    public ResponseBean taRoleButtonAdd(@RequestBody TaRoleButton taRoleButton){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRoleButtonService.save(taRoleButton)){
+                responseBean.addSuccess(taRoleButton);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleButtonAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taRoleButton/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taRoleButtonDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaRoleButtonService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleButtonDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taRoleButton 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taRoleButton/{id}",method= RequestMethod.PUT)
+    public ResponseBean taRoleButtonUpdate(@PathVariable Integer id,
+                                        @RequestBody TaRoleButton taRoleButton){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRoleButtonService.updateById(taRoleButton)){
+                responseBean.addSuccess(taRoleButton);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleButtonUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taRoleButton/{id}",method= RequestMethod.GET)
+    public ResponseBean taRoleButtonGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaRoleButtonService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleButtonDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,168 @@
+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.TaRole;
+import com.huiju.estateagents.service.ITaRoleService;
+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;
+
+/**
+ * <p>
+    * 角色表 角色表，每个org的角色可以单独设置。但是都共有一个admin角色。这个角色在创建用户的时候创建好了 前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@RestController
+@RequestMapping("/api")
+public class TaRoleController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaRoleController.class);
+
+    @Autowired
+    public ITaRoleService iTaRoleService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taRole",method= RequestMethod.GET)
+    public ResponseBean taRoleList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                   HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        Integer orgId = getOrgId(request);
+        try {
+            //使用分页插件
+		    IPage<TaRole> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaRole> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",orgId);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaRole> result = iTaRoleService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taRole 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taRole",method= RequestMethod.POST)
+    public ResponseBean taRoleAdd(@RequestBody TaRole taRole){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRoleService.save(taRole)){
+                responseBean.addSuccess(taRole);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taRole/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taRoleDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaRoleService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taRole 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/editAndAddRole/{id}",method= RequestMethod.POST)
+    public ResponseBean taRoleUpdate(@PathVariable Integer id,
+                                        @RequestBody TaRole taRole) {
+        ResponseBean responseBean = new ResponseBean();
+        if (null==id){
+            iTaRoleService.save(taRole);
+        }else{
+            iTaRoleService.updateById(taRole);
+        }
+        responseBean.addSuccess("成果");
+        return responseBean;
+    }
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taRole/{id}",method= RequestMethod.GET)
+    public ResponseBean taRoleGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaRoleService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改角色状态--停用
+     * @param id
+     * @return
+     */
+    @RequestMapping(value="/admin/taRole/stop/{id}",method= RequestMethod.PUT)
+    public ResponseBean taRoleStop(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        TaRole taRole = new TaRole();
+        taRole = iTaRoleService.getById(id);
+        taRole.setStatus(taRole.getStatus().equals(0)?1:0);
+        iTaRoleService.updateById(taRole);
+        return responseBean;
+    }
+
+    /**
+     * 查询当前角色信息
+     */
+    @RequestMapping(value="/admin/taRole/details/{id}",method= RequestMethod.GET)
+    public ResponseBean taRoleDetails(@PathVariable Integer id,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        TaRole taRole = iTaRoleService.taRoleDetails(id,getOrgId(request));
+        responseBean.addSuccess(taRole);
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/controller/TaRoleMenuController.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.TaRoleMenu;
+import com.huiju.estateagents.service.ITaRoleMenuService;
+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 2019-09-11
+ */
+@RestController
+@RequestMapping("/")
+public class TaRoleMenuController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaRoleMenuController.class);
+
+    @Autowired
+    public ITaRoleMenuService iTaRoleMenuService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taRoleMenu",method= RequestMethod.GET)
+    public ResponseBean taRoleMenuList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaRoleMenu> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaRoleMenu> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaRoleMenu> result = iTaRoleMenuService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleMenuList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taRoleMenu 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taRoleMenu",method= RequestMethod.POST)
+    public ResponseBean taRoleMenuAdd(@RequestBody TaRoleMenu taRoleMenu){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRoleMenuService.save(taRoleMenu)){
+                responseBean.addSuccess(taRoleMenu);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleMenuAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taRoleMenu/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taRoleMenuDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaRoleMenuService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleMenuDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taRoleMenu 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taRoleMenu/{id}",method= RequestMethod.PUT)
+    public ResponseBean taRoleMenuUpdate(@PathVariable Integer id,
+                                        @RequestBody TaRoleMenu taRoleMenu){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRoleMenuService.updateById(taRoleMenu)){
+                responseBean.addSuccess(taRoleMenu);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleMenuUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taRoleMenu/{id}",method= RequestMethod.GET)
+    public ResponseBean taRoleMenuGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaRoleMenuService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRoleMenuDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}