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

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

@@ -156,6 +156,7 @@ public class TaBuildingController extends BaseController {
             @RequestParam(defaultValue = "1") Integer pageNum,
             @RequestParam(defaultValue = "10")Integer pageSize,
             @RequestParam(defaultValue = "false") Boolean mine,
+            @RequestParam(required = false) int cityId,
             String name,
             HttpServletRequest request
     ){
@@ -170,7 +171,7 @@ public class TaBuildingController extends BaseController {
             targets = iTaSaveService.getTargesOfPerson(persons.get(0).getPersonId(), CommConstant.FAVOR_PROJECT);
         }
 
-        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets);
+        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets,cityId);
     }
 
     /**

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

@@ -62,10 +62,11 @@ public class TaBuildingDynamicController extends BaseController {
     @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)String name,
+                                             @RequestParam(required = false)int cityId,
                                              @RequestParam(required = false)String buildingId,
                                              HttpSession session){
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId);
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId);
         return responseBean;
     }
 

src/main/java/com/huiju/estateagents/controller/TaBuildingIntentionController.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.ResponseBean;
+import com.huiju.estateagents.entity.TaBuildingIntention;
+import com.huiju.estateagents.service.ITaBuildingIntentionService;
+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 com.huiju.estateagents.base.BaseController;
+
+/**
+ * <p>
+    * 项目意向表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-08-07
+ */
+@RestController
+@RequestMapping("/")
+public class TaBuildingIntentionController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaBuildingIntentionController.class);
+
+    @Autowired
+    public ITaBuildingIntentionService iTaBuildingIntentionService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taBuildingIntention",method= RequestMethod.GET)
+    public ResponseBean taBuildingIntentionList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaBuildingIntention> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaBuildingIntention> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaBuildingIntention> result = iTaBuildingIntentionService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            logger.error("taBuildingIntentionList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taBuildingIntention 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taBuildingIntention",method= RequestMethod.POST)
+    public ResponseBean taBuildingIntentionAdd(@RequestBody TaBuildingIntention taBuildingIntention){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaBuildingIntentionService.save(taBuildingIntention)){
+                responseBean.addSuccess(taBuildingIntention);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taBuildingIntentionAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taBuildingIntention/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taBuildingIntentionDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaBuildingIntentionService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taBuildingIntentionDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taBuildingIntention 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taBuildingIntention/{id}",method= RequestMethod.PUT)
+    public ResponseBean taBuildingIntentionUpdate(@PathVariable Integer id,
+                                        @RequestBody TaBuildingIntention taBuildingIntention){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaBuildingIntentionService.updateById(taBuildingIntention)){
+                responseBean.addSuccess(taBuildingIntention);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taBuildingIntentionUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taBuildingIntention/{id}",method= RequestMethod.GET)
+    public ResponseBean taBuildingIntentionGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaBuildingIntentionService.getById(id));
+        }catch (Exception e){
+            logger.error("taBuildingIntentionDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/controller/TaEventPropertiesController.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.ResponseBean;
+import com.huiju.estateagents.entity.TaEventProperties;
+import com.huiju.estateagents.service.ITaEventPropertiesService;
+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 com.huiju.estateagents.base.BaseController;
+
+/**
+ * <p>
+    * 事件属性字典  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-08-06
+ */
+@RestController
+@RequestMapping("/")
+public class TaEventPropertiesController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaEventPropertiesController.class);
+
+    @Autowired
+    public ITaEventPropertiesService iTaEventPropertiesService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taEventProperties",method= RequestMethod.GET)
+    public ResponseBean taEventPropertiesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaEventProperties> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaEventProperties> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaEventProperties> result = iTaEventPropertiesService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            logger.error("taEventPropertiesList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taEventProperties 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taEventProperties",method= RequestMethod.POST)
+    public ResponseBean taEventPropertiesAdd(@RequestBody TaEventProperties taEventProperties){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaEventPropertiesService.save(taEventProperties)){
+                responseBean.addSuccess(taEventProperties);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taEventPropertiesAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taEventProperties/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taEventPropertiesDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaEventPropertiesService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taEventPropertiesDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taEventProperties 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taEventProperties/{id}",method= RequestMethod.PUT)
+    public ResponseBean taEventPropertiesUpdate(@PathVariable Integer id,
+                                        @RequestBody TaEventProperties taEventProperties){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaEventPropertiesService.updateById(taEventProperties)){
+                responseBean.addSuccess(taEventProperties);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taEventPropertiesUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taEventProperties/{id}",method= RequestMethod.GET)
+    public ResponseBean taEventPropertiesGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaEventPropertiesService.getById(id));
+        }catch (Exception e){
+            logger.error("taEventPropertiesDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -78,6 +78,7 @@ public class TaNewsController extends BaseController {
     public ResponseBean wxTaNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                      @RequestParam(required = false) String buildingId,
+                                     @RequestParam(required = false) int cityId,
                                      @RequestParam(defaultValue = "false") Boolean mine,
                                      HttpServletRequest request
     ){
@@ -92,7 +93,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);
+        IPage<TaNews> results = iTaNewsService.getWxList(pageNum, pageSize, buildingId, targets,cityId);
         return ResponseBean.success(results);
     }
 

src/main/java/com/huiju/estateagents/controller/TaPersonIntentionRecordController.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.ResponseBean;
+import com.huiju.estateagents.entity.TaPersonIntentionRecord;
+import com.huiju.estateagents.service.ITaPersonIntentionRecordService;
+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 com.huiju.estateagents.base.BaseController;
+
+/**
+ * <p>
+    * 用户意向流水  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-08-07
+ */
+@RestController
+@RequestMapping("/")
+public class TaPersonIntentionRecordController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaPersonIntentionRecordController.class);
+
+    @Autowired
+    public ITaPersonIntentionRecordService iTaPersonIntentionRecordService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taPersonIntentionRecord",method= RequestMethod.GET)
+    public ResponseBean taPersonIntentionRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaPersonIntentionRecord> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaPersonIntentionRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaPersonIntentionRecord> result = iTaPersonIntentionRecordService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            logger.error("taPersonIntentionRecordList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taPersonIntentionRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taPersonIntentionRecord",method= RequestMethod.POST)
+    public ResponseBean taPersonIntentionRecordAdd(@RequestBody TaPersonIntentionRecord taPersonIntentionRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaPersonIntentionRecordService.save(taPersonIntentionRecord)){
+                responseBean.addSuccess(taPersonIntentionRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taPersonIntentionRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taPersonIntentionRecord/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taPersonIntentionRecordDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaPersonIntentionRecordService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taPersonIntentionRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taPersonIntentionRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taPersonIntentionRecord/{id}",method= RequestMethod.PUT)
+    public ResponseBean taPersonIntentionRecordUpdate(@PathVariable Integer id,
+                                        @RequestBody TaPersonIntentionRecord taPersonIntentionRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaPersonIntentionRecordService.updateById(taPersonIntentionRecord)){
+                responseBean.addSuccess(taPersonIntentionRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taPersonIntentionRecordUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taPersonIntentionRecord/{id}",method= RequestMethod.GET)
+    public ResponseBean taPersonIntentionRecordGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaPersonIntentionRecordService.getById(id));
+        }catch (Exception e){
+            logger.error("taPersonIntentionRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -1,13 +1,18 @@
 package com.huiju.estateagents.controller;
 
+import ch.qos.logback.core.status.StatusUtil;
 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.JWTUtils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaEventProperties;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
+import com.huiju.estateagents.service.ITaEventPropertiesService;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaPersonVisitRecordService;
 import org.slf4j.Logger;
@@ -39,6 +44,8 @@ public class TaPersonVisitRecordController extends BaseController {
     public ITaPersonVisitRecordService iTaPersonVisitRecordService;
     @Autowired
     public ITaPersonService taPersonService;
+    @Autowired
+    public ITaEventPropertiesService taEventPropertiesService;
 
 
     /**
@@ -70,13 +77,32 @@ public class TaPersonVisitRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value="/wx/taPersonVisitRecord",method= RequestMethod.POST)
-    public ResponseBean taPersonVisitRecordAdd(@RequestBody TaPersonVisitRecord taPersonVisitRecord, HttpServletRequest request){
+    public ResponseBean taPersonVisitRecordAdd(@RequestBody TaPersonVisitRecord taPersonVisitRecord, HttpServletRequest request,  @RequestParam(value = "buildingId", required = false) String buildingId){
         String openid = JWTUtils.getSubject(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
+        if (!StringUtils.isEmpty(buildingId)){
+            taPersonVisitRecord.setBuildingId(buildingId);
+        }
+        QueryWrapper<TaEventProperties>event = new QueryWrapper<>();
+        event.eq("buildingId",buildingId);
+        event.eq("property_code",taPersonVisitRecord.getActivity());
+        List<TaEventProperties> eventProperties = taEventPropertiesService.list(event);
+        if(eventProperties.size()<=0){
+            TaEventProperties taEventProperty = new TaEventProperties();
+            taEventProperty.setBuildingId(buildingId);
+            taEventProperty.setCreateDate(LocalDateTime.now());
+            taEventProperty.setPropertyCode(taPersonVisitRecord.getActivity());
+            taEventProperty.setPropertyName(taPersonVisitRecord.getPropertyName());
+            taEventProperty.setStatus(CommConstant.STATUS_NORMAL);
+            if (!taEventPropertiesService.save(taEventProperty)){
+                return ResponseBean.error("新增失败",ResponseBean.ERROR_UNAVAILABLE);
+            }
+
+        }
         taPersonVisitRecord.setPersonId(person.getPersonId());
         taPersonVisitRecord.setVisitTime(LocalDateTime.now());
         try {

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

@@ -0,0 +1,169 @@
+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.ResponseBean;
+import com.huiju.estateagents.entity.TdBizEvent;
+import com.huiju.estateagents.service.ITdBizEventService;
+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 com.huiju.estateagents.base.BaseController;
+
+/**
+ * <p>
+    * 事件字典  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-08-06
+ */
+@RestController
+@RequestMapping("/")
+public class TdBizEventController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TdBizEventController.class);
+
+    @Autowired
+    public ITdBizEventService iTdBizEventService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/tdBizEvent",method= RequestMethod.GET)
+    public ResponseBean tdBizEventList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TdBizEvent> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TdBizEvent> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("event_id");
+
+            IPage<TdBizEvent> result = iTdBizEventService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            logger.error("tdBizEventList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/tdBizEvent",method= RequestMethod.GET)
+    public ResponseBean tdBizEventListWx(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TdBizEvent> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TdBizEvent> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("event_id");
+
+            IPage<TdBizEvent> result = iTdBizEventService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            logger.error("tdBizEventList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param tdBizEvent 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tdBizEvent",method= RequestMethod.POST)
+    public ResponseBean tdBizEventAdd(@RequestBody TdBizEvent tdBizEvent){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTdBizEventService.save(tdBizEvent)){
+                responseBean.addSuccess(tdBizEvent);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tdBizEventAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/tdBizEvent/{id}", method= RequestMethod.DELETE)
+    public ResponseBean tdBizEventDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTdBizEventService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tdBizEventDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param tdBizEvent 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tdBizEvent/{id}",method= RequestMethod.PUT)
+    public ResponseBean tdBizEventUpdate(@PathVariable Integer id,
+                                        @RequestBody TdBizEvent tdBizEvent){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTdBizEventService.updateById(tdBizEvent)){
+                responseBean.addSuccess(tdBizEvent);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tdBizEventUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/tdBizEvent/{id}",method= RequestMethod.GET)
+    public ResponseBean tdBizEventGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTdBizEventService.getById(id));
+        }catch (Exception e){
+            logger.error("tdBizEventDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/controller/TdBizEventTypeController.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.ResponseBean;
+import com.huiju.estateagents.entity.TdBizEventType;
+import com.huiju.estateagents.service.ITdBizEventTypeService;
+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 com.huiju.estateagents.base.BaseController;
+
+/**
+ * <p>
+    * 事件类型字典  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-08-06
+ */
+@RestController
+@RequestMapping("/")
+public class TdBizEventTypeController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TdBizEventTypeController.class);
+
+    @Autowired
+    public ITdBizEventTypeService iTdBizEventTypeService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/tdBizEventType",method= RequestMethod.GET)
+    public ResponseBean tdBizEventTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TdBizEventType> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TdBizEventType> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("type_id");
+
+            IPage<TdBizEventType> result = iTdBizEventTypeService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            logger.error("tdBizEventTypeList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/tdBizEventType",method= RequestMethod.GET)
+    public ResponseBean tdBizEventTypeListWx(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TdBizEventType> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TdBizEventType> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("type_id");
+
+            IPage<TdBizEventType> result = iTdBizEventTypeService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            logger.error("tdBizEventTypeList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param tdBizEventType 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tdBizEventType",method= RequestMethod.POST)
+    public ResponseBean tdBizEventTypeAdd(@RequestBody TdBizEventType tdBizEventType){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTdBizEventTypeService.save(tdBizEventType)){
+                responseBean.addSuccess(tdBizEventType);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tdBizEventTypeAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/tdBizEventType/{id}", method= RequestMethod.DELETE)
+    public ResponseBean tdBizEventTypeDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTdBizEventTypeService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tdBizEventTypeDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param tdBizEventType 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tdBizEventType/{id}",method= RequestMethod.PUT)
+    public ResponseBean tdBizEventTypeUpdate(@PathVariable Integer id,
+                                        @RequestBody TdBizEventType tdBizEventType){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTdBizEventTypeService.updateById(tdBizEventType)){
+                responseBean.addSuccess(tdBizEventType);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tdBizEventTypeUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/tdBizEventType/{id}",method= RequestMethod.GET)
+    public ResponseBean tdBizEventTypeGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTdBizEventTypeService.getById(id));
+        }catch (Exception e){
+            logger.error("tdBizEventTypeDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,155 @@
+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.ResponseBean;
+import com.huiju.estateagents.entity.TdCity;
+import com.huiju.estateagents.service.ITdCityService;
+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 com.huiju.estateagents.base.BaseController;
+
+import java.util.List;
+
+/**
+ * <p>
+    *  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-08-07
+ */
+@RestController
+@RequestMapping("/")
+public class TdCityController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TdCityController.class);
+
+    @Autowired
+    public ITdCityService iTdCityService;
+
+
+    /**
+     * 查询列表
+     * @return
+     */
+    @RequestMapping(value="/admin/tdCity",method= RequestMethod.GET)
+    public ResponseBean tdCityList(@RequestParam(value = "leveltype", required = false) String leveltype){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            List<TdCity> result = iTdCityService.selectCity(leveltype);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            logger.error("tdCityList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 查询列表
+     * @return
+     */
+    @RequestMapping(value="/wx/tdCity",method= RequestMethod.GET)
+    public ResponseBean tdCityListWx(@RequestParam(value = "leveltype", required = false) String leveltype){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            List<TdCity> result = iTdCityService.selectCity(leveltype);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            logger.error("tdCityList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param tdCity 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tdCity",method= RequestMethod.POST)
+    public ResponseBean tdCityAdd(@RequestBody TdCity tdCity){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTdCityService.save(tdCity)){
+                responseBean.addSuccess(tdCity);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tdCityAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/tdCity/{id}", method= RequestMethod.DELETE)
+    public ResponseBean tdCityDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTdCityService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tdCityDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param tdCity 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tdCity/{id}",method= RequestMethod.PUT)
+    public ResponseBean tdCityUpdate(@PathVariable Integer id,
+                                        @RequestBody TdCity tdCity){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTdCityService.updateById(tdCity)){
+                responseBean.addSuccess(tdCity);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("tdCityUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/tdCity/{id}",method= RequestMethod.GET)
+    public ResponseBean tdCityGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTdCityService.getById(id));
+        }catch (Exception e){
+            logger.error("tdCityDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -2,6 +2,8 @@ package com.huiju.estateagents.entity;
 
 import java.io.Serializable;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -24,6 +26,7 @@ public class TaApartmentImg implements Serializable {
     /**
      * 户型id
      */
+    @TableId(value = "apartment_id", type = IdType.UUID)
     private String apartmentId;
 
     /**

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

@@ -217,4 +217,6 @@ public class TaBuilding implements Serializable {
 
     @TableField(exist = false)
     private List<Map<String, Object>> consultants;
+
+    private int cityId;
 }

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

@@ -159,4 +159,6 @@ public class TaBuildingDynamic implements Serializable {
      * 活动人数
      */
     private  String personNum;
+
+    private int cityId;
 }

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

@@ -0,0 +1,73 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 项目意向表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaBuildingIntention implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设置ID
+     */
+    @TableId(value = "intention_id", type = IdType.AUTO)
+    private Integer intentionId;
+
+    /**
+     * 事件ID
+     */
+    private Integer eventId;
+
+    /**
+     * 事件code
+     */
+    private String eventCode;
+
+    /**
+     * 事件名称
+     */
+    private String eventName;
+
+    /**
+     * 意向值
+     */
+    private Integer intention;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+
+}

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

@@ -0,0 +1,63 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 事件属性字典 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaEventProperties implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 属性ID
+     */
+    @TableId(value = "property_id", type = IdType.AUTO)
+    private Integer propertyId;
+
+    /**
+     * 属性code
+     */
+    private String propertyCode;
+
+    /**
+     * 属性名称
+     */
+    private String propertyName;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+
+}

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

@@ -101,4 +101,6 @@ public class TaNews implements Serializable {
      */
     @TableField(exist = false)
     private TaNewsType newsType;
+
+    private int cityId;
 }

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

@@ -0,0 +1,88 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 用户意向流水 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaPersonIntentionRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    /**
+     * 用户ID
+     */
+    private String personId;
+
+    /**
+     * 用户名称
+     */
+    private String personName;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 楼盘名称
+     */
+    private String buildingName;
+
+    /**
+     * 事件ID
+     */
+    private Integer eventId;
+
+    /**
+     * 事件code
+     */
+    private String eventCode;
+
+    /**
+     * 事件名称
+     */
+    private String eventName;
+
+    /**
+     * 意向值
+     */
+    private Integer intention;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+
+}

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -69,6 +70,16 @@ public class TaPersonVisitRecord implements Serializable {
      */
     private String activity;
 
+    private String eventType;
+
+    private String buildingId;
+
+    private String orgId;
+
+    @TableField(exist = false)
+    private String propertyName;
+
+    private String targetId;
 
 
 

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

@@ -0,0 +1,62 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 事件字典 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TdBizEvent implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 事件ID
+     */
+    @TableId(value = "event_id", type = IdType.AUTO)
+    private Integer eventId;
+
+    /**
+     * 事件编码
+     */
+    private String eventCode;
+
+    /**
+     * 事件名称
+     */
+    private String eventName;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    private String typeId;
+
+    private String typeName;
+
+
+}

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

@@ -0,0 +1,45 @@
+package com.huiju.estateagents.entity;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 事件类型字典 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TdBizEventType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 类型ID
+     */
+    private String typeId;
+
+    /**
+     * 类型名称
+     */
+    private String typeName;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

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

@@ -0,0 +1,73 @@
+package com.huiju.estateagents.entity;
+
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TdCity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 省市区名称
+     */
+    private String name;
+
+    /**
+     * 上级ID
+     */
+    private Integer parentid;
+
+    /**
+     * 简称
+     */
+    private String shortname;
+
+    /**
+     * 级别:0,中国；1，省分；2，市；3，区、县
+     */
+    private Integer leveltype;
+
+    /**
+     * 城市代码
+     */
+    private String citycode;
+
+    /**
+     * 邮编
+     */
+    private String zipcode;
+
+    /**
+     * 经度
+     */
+    private String lng;
+
+    /**
+     * 纬度
+     */
+    private String lat;
+
+    /**
+     * 拼音
+     */
+    private String pinyin;
+
+    private String status;
+
+    private String initial;
+
+
+}

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

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

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

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaBuildingIntention;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 项目意向表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-07
+ */
+@Mapper
+public interface TaBuildingIntentionMapper extends BaseMapper<TaBuildingIntention> {
+
+}

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

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaEventProperties;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 事件属性字典  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-06
+ */
+@Mapper
+public interface TaEventPropertiesMapper extends BaseMapper<TaEventProperties> {
+
+}

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

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaPersonIntentionRecord;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 用户意向流水  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-07
+ */
+@Mapper
+public interface TaPersonIntentionRecordMapper extends BaseMapper<TaPersonIntentionRecord> {
+
+}

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

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TdBizEvent;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 事件字典  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-06
+ */
+@Mapper
+public interface TdBizEventMapper extends BaseMapper<TdBizEvent> {
+
+}

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

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TdBizEventType;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 事件类型字典  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-06
+ */
+@Mapper
+public interface TdBizEventTypeMapper extends BaseMapper<TdBizEventType> {
+
+}

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

@@ -0,0 +1,23 @@
+package com.huiju.estateagents.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TdCity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-07
+ */
+@Mapper
+public interface TdCityMapper extends BaseMapper<TdCity> {
+    List<TdCity> selectCity(@Param("leveltype")String leveltype);
+
+}

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

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

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

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaBuildingIntention;
+
+/**
+ * <p>
+ * 项目意向表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-07
+ */
+public interface ITaBuildingIntentionService extends IService<TaBuildingIntention> {
+
+}

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

@@ -107,7 +107,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param pageSize
      * @param name
      */
-    ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets);
+    ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets,int cityId);
 
     /**
      * 微信小程序 楼盘列表

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

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaEventProperties;
+
+/**
+ * <p>
+ * 事件属性字典  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-06
+ */
+public interface ITaEventPropertiesService extends IService<TaEventProperties> {
+
+}

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

@@ -70,5 +70,5 @@ public interface ITaNewsService extends IService<TaNews> {
      */
     ResponseBean wxTaPvNum(Integer id);
 
-    IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets);
+    IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,int cityId);
 }

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

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaPersonIntentionRecord;
+
+/**
+ * <p>
+ * 用户意向流水  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-07
+ */
+public interface ITaPersonIntentionRecordService extends IService<TaPersonIntentionRecord> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TdBizEvent;
+
+/**
+ * <p>
+ * 事件字典  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-06
+ */
+public interface ITdBizEventService extends IService<TdBizEvent> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TdBizEventType;
+
+/**
+ * <p>
+ * 事件类型字典  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-06
+ */
+public interface ITdBizEventTypeService extends IService<TdBizEventType> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TdCity;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-07
+ */
+public interface ITdCityService extends IService<TdCity> {
+    List<TdCity> selectCity(String leveltype);
+
+}

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

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

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaBuildingIntention;
+import com.huiju.estateagents.mapper.TaBuildingIntentionMapper;
+import com.huiju.estateagents.service.ITaBuildingIntentionService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 项目意向表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-07
+ */
+@Service
+public class TaBuildingIntentionServiceImpl extends ServiceImpl<TaBuildingIntentionMapper, TaBuildingIntention> implements ITaBuildingIntentionService {
+
+}

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

@@ -311,12 +311,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets) {
+    public ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets,int cityId) {
         IPage<TaBuilding> page = new Page<>(pageNum, pageSize);
 
         QueryWrapper<TaBuilding> buildingQueryWrapper = new QueryWrapper<>();
         buildingQueryWrapper.nested(null != name && !"".equals(name.trim()), i -> i.like("name", name).or().like("building_name", name));
         buildingQueryWrapper.eq("status", 1);
+        buildingQueryWrapper.eq(cityId != 0,"city_id",cityId);
         buildingQueryWrapper.in(null != targets && targets.size() > 0, "building_id", targets);
 //        buildingQueryWrapper.like(null != name && !"".equals(name.trim()), "name", name);
         buildingQueryWrapper.orderByAsc("order_no");

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaEventProperties;
+import com.huiju.estateagents.mapper.TaEventPropertiesMapper;
+import com.huiju.estateagents.service.ITaEventPropertiesService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 事件属性字典  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-06
+ */
+@Service
+public class TaEventPropertiesServiceImpl extends ServiceImpl<TaEventPropertiesMapper, TaEventProperties> implements ITaEventPropertiesService {
+
+}

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

@@ -182,12 +182,13 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
     }
 
     @Override
-    public IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets) {
+    public IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,int cityId) {
         IPage<TaNews> page = new Page<>(pageNum, pageSize);
 
         QueryWrapper<TaNews> taNewsQueryWrapper = new QueryWrapper<>();
         taNewsQueryWrapper.eq(!StringUtils.isEmpty(buildingId), "building_id", buildingId);
         taNewsQueryWrapper.in(null != targets && targets.size() > 0, "news_id", targets);
+        taNewsQueryWrapper.eq(cityId != 0,"city_id",cityId);
         taNewsQueryWrapper.eq("status", 1);
         taNewsQueryWrapper.orderByDesc("create_date");
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);

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

@@ -0,0 +1,21 @@
+package com.huiju.estateagents.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaPersonIntentionRecord;
+import com.huiju.estateagents.mapper.TaPersonIntentionRecordMapper;
+import com.huiju.estateagents.service.ITaPersonIntentionRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户意向流水  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-07
+ */
+@Service
+public class TaPersonIntentionRecordServiceImpl extends ServiceImpl<TaPersonIntentionRecordMapper, TaPersonIntentionRecord> implements ITaPersonIntentionRecordService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TdBizEvent;
+import com.huiju.estateagents.mapper.TdBizEventMapper;
+import com.huiju.estateagents.service.ITdBizEventService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 事件字典  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-06
+ */
+@Service
+public class TdBizEventServiceImpl extends ServiceImpl<TdBizEventMapper, TdBizEvent> implements ITdBizEventService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TdBizEventType;
+import com.huiju.estateagents.mapper.TdBizEventTypeMapper;
+import com.huiju.estateagents.service.ITdBizEventTypeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 事件类型字典  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-06
+ */
+@Service
+public class TdBizEventTypeServiceImpl extends ServiceImpl<TdBizEventTypeMapper, TdBizEventType> implements ITdBizEventTypeService {
+
+}

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

@@ -0,0 +1,29 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TdCity;
+import com.huiju.estateagents.mapper.TdCityMapper;
+import com.huiju.estateagents.service.ITdCityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-07
+ */
+@Service
+public class TdCityServiceImpl extends ServiceImpl<TdCityMapper, TdCity> implements ITdCityService {
+    @Autowired
+    TdCityMapper tdCityMapper;
+
+    public List<TdCity> selectCity(String leveltype){
+        return tdCityMapper.selectCity(leveltype);
+    }
+
+}

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -24,6 +24,9 @@
         <if test="buildingId != null and buildingId !=''">
             and building_id = #{buildingId}
         </if>
+        <if test="cityId != 0">
+            and city_id = #{cityId}
+        </if>
         ORDER BY create_date DESC
   </select>
 

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

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

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

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

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

src/main/resources/mapper/TdCityMapper.xml

@@ -0,0 +1,20 @@
+<?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.TdCityMapper">
+    <select id="selectCity" resultType="com.huiju.estateagents.entity.TdCity">
+        SELECT
+	*,
+	LEFT(pinyin,1) AS initial
+FROM
+	td_city
+	<where>
+        <if test="leveltype != '' and leveltype != null">
+            leveltype = #{leveltype}
+        </if>
+    </where>
+ORDER BY
+	pinyin
+    </select>
+    
+
+</mapper>