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

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

@@ -115,7 +115,11 @@ public class TaUser implements Serializable {
     private String address;
     private String photo;
     private String description;
-
+    
+    /**
+     * 是否置业顾问
+     */
+    private Boolean isConsultant;
 
     /**
      * 公司水印

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;
@@ -35,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);
@@ -54,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,
@@ -80,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,
@@ -99,6 +124,10 @@ 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, HttpServletRequest request){
         Integer cityId = iTaBuildingService.getCityById(extendContent.getBuildingId());
@@ -114,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){
@@ -138,6 +171,11 @@ 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,HttpServletRequest request){
@@ -164,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/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;
@@ -35,6 +39,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "楼盘")
 public class TaBuildingController extends BaseController {
 
     @Autowired
@@ -53,6 +58,10 @@ 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);
     }
@@ -65,6 +74,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")
     public ResponseBean buildingList(@RequestParam(value = "pageNum", defaultValue = "1")Integer pageNum,
                                      @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
@@ -87,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,
@@ -106,6 +139,10 @@ public class TaBuildingController extends BaseController {
      * @param parameter
      * @return
      */
+    @ApiOperation(value = "更新项目", notes = "更新项目")
+    @ApiImplicitParams({
+
+    })
     @PutMapping("/admin/building/update")
     public ResponseBean buildingUpdate(@RequestBody String parameter, HttpServletRequest request){
         return taBuildingService.buildingUpdate(parameter, getOrgId(request));
@@ -116,6 +153,10 @@ 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, HttpServletRequest request){
         return taBuildingService.buildingAdd(parameter, getOrgId(request));
@@ -126,6 +167,10 @@ public class TaBuildingController extends BaseController {
      * @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, HttpServletRequest request){
         return taBuildingService.buildingUpdateStatus(parameter, getOrgId(request));
@@ -137,6 +182,10 @@ public class TaBuildingController extends BaseController {
      * @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, HttpServletRequest request){
         return taBuildingService.buildingdelete(id, getOrgId(request));
@@ -148,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);
@@ -158,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);
@@ -178,6 +233,10 @@ public class TaBuildingController extends BaseController {
      * @param id
      * @return
      */
+    @ApiOperation(value = "依据项目ID 查户型", notes = "依据项目ID 查户型")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "id", value = "项目ID"),
+    })
     @RequestMapping(value = "/admin/buildingApartment/buildingId/{id}", method = RequestMethod.GET)
     public ResponseBean buildingApartmentBuildingId(@PathVariable(value = "id") String id){
         return taBuildingService.buildingApartmentBuildingId(id);

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

@@ -17,6 +17,10 @@ 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 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.format.annotation.DateTimeFormat;
@@ -45,6 +49,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "项目活动", tags = "项目活动")
 public class TaBuildingDynamicController extends BaseController {
 
     @Autowired
@@ -68,7 +73,18 @@ public class TaBuildingDynamicController extends BaseController {
         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,
@@ -95,6 +111,14 @@ public class TaBuildingDynamicController extends BaseController {
      * @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,
@@ -118,14 +142,13 @@ public class TaBuildingDynamicController extends BaseController {
 
         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,
@@ -168,6 +191,10 @@ 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){
@@ -183,6 +210,10 @@ 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){
@@ -198,8 +229,12 @@ public class TaBuildingDynamicController extends BaseController {
         ResponseBean  responseBean = iBuildingDynamicService.taActivityDynamicEnlistAdd(taActivityDynamicEnlist);
         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,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -215,7 +250,11 @@ public class TaBuildingDynamicController extends BaseController {
         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,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -228,7 +267,12 @@ public class TaBuildingDynamicController extends BaseController {
         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,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -244,14 +288,22 @@ 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, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
@@ -264,7 +316,11 @@ public class TaBuildingDynamicController extends BaseController {
         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, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
@@ -276,7 +332,11 @@ public class TaBuildingDynamicController extends BaseController {
         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();
@@ -292,7 +352,13 @@ 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")
+    })
     @RequestMapping(value = "/admin/SignList", method = RequestMethod.GET)
     public ResponseBean getSignList(@RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
                                     @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
@@ -310,7 +376,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();

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

@@ -6,7 +6,7 @@ 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;
@@ -14,6 +14,9 @@ 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;
@@ -41,6 +44,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "渠道管理", tags = "渠道管理")
 public class TaChannelController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaChannelController.class);
@@ -56,11 +60,17 @@ public class TaChannelController extends BaseController {
 
 
     /**
-     * 分页查询列表
+     * 渠道管理列表
      * @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,
@@ -87,10 +97,14 @@ public class TaChannelController extends BaseController {
     }
 
     /**
-     * 保存对象
+     * 渠道保存
      * @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);
@@ -117,6 +131,10 @@ public class TaChannelController extends BaseController {
      * 根据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){
@@ -141,6 +159,10 @@ public class TaChannelController extends BaseController {
      * @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){
@@ -164,6 +186,10 @@ public class TaChannelController extends BaseController {
      * 根据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();
@@ -180,6 +206,14 @@ public class TaChannelController extends BaseController {
     /**
      * 渠道管理下的经纪人
      */
+    @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,
@@ -195,6 +229,14 @@ public class TaChannelController extends BaseController {
     /**
      * 渠道邀请经纪人
      */
+    @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,

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

@@ -13,6 +13,10 @@ 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;
@@ -40,6 +44,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "商品", tags = "商品")
 public class TaGoodsController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaGoodsController.class);
@@ -59,6 +64,16 @@ public class TaGoodsController 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 = "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,
@@ -95,6 +110,10 @@ 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,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -143,6 +162,10 @@ 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,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -169,6 +192,10 @@ 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,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -196,6 +223,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();
@@ -215,6 +246,12 @@ public class TaGoodsController 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="/wx/goods",method= RequestMethod.GET)
     public ResponseBean wxGoodsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
@@ -260,6 +297,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();
@@ -279,6 +320,10 @@ 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();

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,6 +57,12 @@ 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,
@@ -82,6 +93,12 @@ 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,
                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
@@ -110,6 +127,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();
@@ -144,6 +165,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){
@@ -169,6 +194,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,
@@ -203,6 +233,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();
@@ -219,6 +253,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="/wx/taPolicy/{id}",method= RequestMethod.GET)
     public ResponseBean taPolicyGetWx(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();

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

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

@@ -4,12 +4,17 @@ 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.entity.TaBuilding;
 import com.huiju.estateagents.entity.TdBuildingType;
+import com.huiju.estateagents.exception.EstaException;
+import com.huiju.estateagents.mapper.TaBuildingMapper;
+import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITdBuildingTypeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +28,8 @@ import org.springframework.web.bind.annotation.RestController;
 import com.huiju.estateagents.base.BaseController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -42,6 +49,8 @@ public class TdBuildingTypeController extends BaseController {
     @Autowired
     public ITdBuildingTypeService iTdBuildingTypeService;
 
+    @Autowired
+    public TaBuildingMapper taBuildingMapper;
 
     /**
      * 分页查询列表
@@ -82,6 +91,11 @@ public class TdBuildingTypeController 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 = "一页多少行")
+    })
     @RequestMapping(value="/wx/tdBuildingType",method= RequestMethod.GET)
     public ResponseBean tdWxBuildingTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
@@ -111,6 +125,7 @@ public class TdBuildingTypeController extends BaseController {
      * @param tdBuildingType 实体对象
      * @return
      */
+    @ApiOperation(value = "项目类型保存", notes = "项目类型保存")
     @RequestMapping(value="/admin/tdBuildingType",method= RequestMethod.POST)
     public ResponseBean tdBuildingTypeAdd(@RequestBody TdBuildingType tdBuildingType, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -132,6 +147,10 @@ public class TdBuildingTypeController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
+    @ApiOperation(value = "项目类型 根据项目类型id删除", notes = "项目类型删除 根据项目类型id删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "id", paramType = "path",value = "项目类型id"),
+    })
     @ResponseBody
     @RequestMapping(value="/admin/tdBuildingType/{id}", method= RequestMethod.DELETE)
     public ResponseBean tdBuildingTypeDelete(@PathVariable Integer id){
@@ -155,12 +174,27 @@ public class TdBuildingTypeController extends BaseController {
      * @param tdBuildingType 实体对象
      * @return
      */
+    @ApiOperation(value = "项目类型 根据项目类型id修改", notes = "项目类型删除 根据项目类型id修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "id", paramType = "path",value = "项目类型id"),
+            @ApiImplicitParam(dataTypeClass = TdBuildingType.class, name = "tdBuildingType", paramType = "body",value = "项目类型"),
+    })
     @RequestMapping(value="/admin/tdBuildingType/{id}",method= RequestMethod.PUT)
     public ResponseBean tdBuildingTypeUpdate(@PathVariable Integer id,
                                         @RequestBody TdBuildingType tdBuildingType,
                                              HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+
+            // 如果是删除，状态为 -1
+            if ( null != tdBuildingType.getStatus() && -1 == tdBuildingType.getStatus().intValue()) {
+                List<TaBuilding> taBuildings = taBuildingMapper.selectBuildingByBuildingTypeId(tdBuildingType.getBuildingTypeId());
+                if (CollectionUtils.isNotEmpty(taBuildings)) {
+                    String buildingNames = taBuildings.stream().map(e -> e.getBuildingName()).collect(Collectors.joining(","));
+                    throw new EstaException("项目 " + buildingNames + " 正在使用此类型，请先到项目列表中修改项目的项目类型为其他类型，再删除此类型");
+                }
+            }
+
             tdBuildingType.setOrgId(getOrgId(request));
             if (iTdBuildingTypeService.updateById(tdBuildingType)){
                 responseBean.addSuccess(tdBuildingType);
@@ -178,6 +212,10 @@ public class TdBuildingTypeController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
+    @ApiOperation(value = "项目类型 根据项目类型id查询对象", notes = "项目类型删除 根据项目类型id查询对象")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "id", paramType = "path",value = "项目类型id"),
+    })
     @RequestMapping(value="/admin/tdBuildingType/{id}",method= RequestMethod.GET)
     public ResponseBean tdBuildingTypeGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();

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

@@ -8,6 +8,10 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TdPointsRules;
 import com.huiju.estateagents.service.ITdPointsRulesService;
+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;
@@ -32,6 +36,7 @@ import javax.servlet.http.HttpServletRequest;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "积分", tags = "积分")
 public class TdPointsRulesController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TdPointsRulesController.class);
@@ -46,6 +51,13 @@ public class TdPointsRulesController 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 = "type", paramType = "query",value = "类型")
+    })
     @RequestMapping(value="/admin/tdPointsRules",method= RequestMethod.GET)
     public ResponseBean tdPointsRulesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
@@ -58,7 +70,7 @@ public class TdPointsRulesController extends BaseController {
 		    IPage<TdPointsRules> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TdPointsRules> queryWrapper = new QueryWrapper<>();
             Integer orgId = getOrgId(request);
-            queryWrapper.eq("org_id",orgId);
+            //queryWrapper.eq("org_id",orgId);
             queryWrapper.orderByDesc("create_date");
             queryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
             if (CommConstant.POINTS_RULE_PLATFORM.equals(type)) {
@@ -83,6 +95,13 @@ public class TdPointsRulesController 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 = "type", paramType = "query",value = "类型")
+    })
     @RequestMapping(value="/wx/tdPointsRules",method= RequestMethod.GET)
     public ResponseBean tdWxPointsRulesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
@@ -165,6 +184,10 @@ public class TdPointsRulesController extends BaseController {
      * @param tdPointsRules 实体对象
      * @return
      */
+    @ApiOperation(value = "后台积分规则修改", notes = "后台积分规则修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "TdPointsRules", name = "tdPointsRules", paramType = "body",value = "积分详细数据")
+    })
     @RequestMapping(value="/admin/tdPointsRules",method= RequestMethod.PUT)
     public ResponseBean tdPointsRulesUpdate(@RequestBody TdPointsRules tdPointsRules){
         ResponseBean responseBean = new ResponseBean();
@@ -187,6 +210,10 @@ public class TdPointsRulesController extends BaseController {
      * @param tdPointsRules 实体对象
      * @return
      */
+    @ApiOperation(value = "后台积分规则停用启用", notes = "后台积分规则停用启用")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "TdPointsRules", name = "tdPointsRules", paramType = "body",value = "积分详细数据")
+    })
     @RequestMapping(value="/admin/tdPointsRules/change",method= RequestMethod.PUT)
     public ResponseBean tdPointsRulesChange(@RequestBody TdPointsRules tdPointsRules){
         ResponseBean responseBean = new ResponseBean();
@@ -213,6 +240,10 @@ public class TdPointsRulesController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
+    @ApiOperation(value = "后台积分规则详情", notes = "后台积分规则详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "Integer", name = "id", paramType = "path",value = "积分id")
+    })
     @RequestMapping(value="/admin/tdPointsRules/{id}",method= RequestMethod.GET)
     public ResponseBean tdPointsRulesGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();

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

@@ -6,6 +6,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TdReport;
 import com.huiju.estateagents.service.ITdReportService;
+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;
@@ -28,6 +32,7 @@ import com.huiju.estateagents.base.BaseController;
  */
 @RestController
 @RequestMapping("/api")
+@Api(value = "客户留言", tags = "客户留言")
 public class TdReportController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TdReportController.class);
@@ -42,6 +47,11 @@ public class TdReportController 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 = "一页多少行")
+    })
     @RequestMapping(value="/admin/tdReports",method= RequestMethod.GET)
     public ResponseBean tdReportList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){

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

@@ -177,6 +177,11 @@ public class TaBuildingDynamic implements Serializable {
     private Integer enlistNum;
 
     private Integer weight;
+    
+    /**
+     * 最大报名人数
+     */
+    private Integer maxEnlistByPerson;
 
     /**
      * 公司Id

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

@@ -0,0 +1,74 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *  
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaSharePersonFrom implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 分享来源id
+     */
+    @TableId(value = "share_from_id", type = IdType.AUTO)
+    private Integer shareFromId;
+
+    /**
+     * 分享人
+     */
+    private String sharePerson;
+
+    /**
+     * 分享人类型
+     */
+    private String sharePersonType;
+
+    /**
+     * 被分享人
+     */
+    private String personId;
+
+    /**
+     * 分享类型
+     */
+    private String targetType;
+
+    /**
+     * 目标id
+     */
+    private String targetId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+
+}

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

@@ -78,4 +78,11 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
                                          @Param("areaList") List<String[]> areaList,
                                          @Param("orgId")Integer orgId);
 
+    /**
+     * 根据项目类型Id 查询
+     * @param buildingTypeId
+     * @return
+     */
+    List<TaBuilding> selectBuildingByBuildingTypeId(Integer buildingTypeId);
+
 }

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

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

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaSharePersonFrom;
+
+/**
+ * <p>
+ *   服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-08
+ */
+public interface ITaSharePersonFromService extends IService<TaSharePersonFrom> {
+
+}

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

@@ -638,6 +638,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         for (TaPerson taPerson:taPersonList){
             QueryWrapper<TaRecommendCustomer> taRecommendCustomerQuery= new QueryWrapper<>();
             taRecommendCustomerQuery.eq("recommend_person",taPerson.getPersonId());
+            taRecommendCustomerQuery.eq("status",1);
             /*推荐客户总数*/
             int recommendCount= taRecommendCustomerMapper.selectCount(taRecommendCustomerQuery);
             taPerson.setRecommendCount(recommendCount);

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaSharePersonFrom;
+import com.huiju.estateagents.mapper.TaSharePersonFromMapper;
+import com.huiju.estateagents.service.ITaSharePersonFromService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *   服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-08
+ */
+@Service
+public class TaSharePersonFromServiceImpl extends ServiceImpl<TaSharePersonFromMapper, TaSharePersonFrom> implements ITaSharePersonFromService {
+
+}

src/main/resources/mapper/TaBuildingMapper.xml

@@ -179,4 +179,19 @@
             ORDER BY tb.order_no DESC
     </select>
 
+    <select id="selectBuildingByBuildingTypeId" resultType="com.huiju.estateagents.entity.TaBuilding">
+
+        SELECT
+            tab.*
+        FROM
+            ta_building_project_type tbpt
+            LEFT JOIN td_building_type tbt ON tbpt.building_type_id = tbt.building_type_id
+            LEFT JOIN ta_building tab ON tbpt.building_id = tab.building_id
+        WHERE
+          tab.status <![CDATA[ > ]]> -1
+        and
+          tbpt.building_type_id = #{buildingTypeId}
+
+    </select>
+
 </mapper>

src/main/resources/mapper/TaSharePersonFromMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.TaSharePersonFromMapper">
+
+</mapper>