tagert!

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

@@ -201,8 +201,14 @@ public class TaBuildingController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/wx/buildingSelectId/{id}", method = RequestMethod.GET)
-    public ResponseBean wxBuildingSelectId(@PathVariable(value = "id") String id){
-        return taBuildingService.buildingAllSelectId(id);
+    public ResponseBean wxBuildingSelectId(@PathVariable(value = "id") String id,HttpServletRequest request){
+        String openid = JWTUtils.getSubject(request);
+        List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
+        if (null == persons || persons.size() == 0) {
+            return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = persons.get(0);
+        return taBuildingService.buildingAllSelectId(id,person.getPersonId());
     }
     /**
      * 查询当前所有项目

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

@@ -148,8 +148,14 @@ public class TaNewsController extends BaseController {
      * @param id  实体ID
      */
     @RequestMapping(value="/wx/taNews/{id}",method= RequestMethod.GET)
-    public ResponseBean wxTaNewsGet(@PathVariable Integer id){
-        ResponseBean responseBean = iTaNewsService.getWxTaNewsById(id);
+    public ResponseBean wxTaNewsGet(@PathVariable Integer id,HttpServletRequest request){
+        String openid = JWTUtils.getSubject(request);
+        List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
+        if (null == persons || persons.size() == 0) {
+            return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = persons.get(0);
+        ResponseBean responseBean = iTaNewsService.getWxTaNewsById(id,person.getPersonId());
         return responseBean;
     }
 

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

@@ -1,380 +1,384 @@
-package com.huiju.estateagents.controller;
-
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.JWTUtils;
-import com.huiju.estateagents.entity.TaBuildingDynamic;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaPersonBuilding;
-import com.huiju.estateagents.service.ITaPersonService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import com.huiju.estateagents.base.BaseController;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 人员表 前端控制器
- * </p>
- *
- * @author jobob
- * @since 2019-05-10
- */
-@RestController
-@RequestMapping("/api")
-public class TaPersonController extends BaseController {
-    @Autowired
-    ITaPersonService taPersonService;
-
-    /**
-     *
-     *  因为人员表是集合系统的所有种类的用户，包含了各种角色。因此各种角色的操作都在本 controller 中完成
-     *  以下是置业顾问卡片内容
-     *
-     */
-
-    /**
-     * 获取卡片列表
-     * @param pageNumber
-     * @param pageSize
-     * @return
-     */
-    @GetMapping("/wx/cards")
-    public ResponseBean getCardList(@RequestParam(defaultValue = "1") int pageNumber,
-                                    @RequestParam(defaultValue = "10") int pageSize,
-                                    @RequestParam(defaultValue = "false") boolean mine,HttpServletRequest request) {
-        if (pageNumber < 0 || pageSize < 0) {
-            return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-        if (mine){
-            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);
-            IPage<Map<String, Object>>  result = taPersonService.getSavedConsaultants(pageNumber,pageSize,person.getPersonId());
-            return ResponseBean.success(result);
-        }else {
-            IPage<Map<String, Object>> result = taPersonService.getCardList(pageNumber, pageSize);
-            return ResponseBean.success(result);
-        }
-
-
-    }
-
-    /**
-     * 绑定卡片
-     * @param paramStr
-     * @return
-     */
-    @PostMapping("/wx/cards/apply")
-    public ResponseBean applyCard(@RequestBody String paramStr, HttpServletRequest request) {
-        JSONObject params = JSONObject.parseObject(paramStr);
-        String phone = (String) params.get("phone");
-        String pass = (String) params.get("pass");
-        String openid = JWTUtils.getSubject(request);
-
-        if (isEmpty(phone) || isEmpty(pass)) {
-            return ResponseBean.error("参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-
-        ResponseBean resp = taPersonService.checkPhoneAndPass(phone, pass);
-
-        // 成功返回空数据
-        if (resp.getCode() != ResponseBean.CODE_SUCCESS) {
-            return resp;
-        }
-
-        return taPersonService.bindCard(phone, pass, openid);
-    }
-
-    /**
-     * 获取名片详情
-     * @param id
-     * @return
-     */
-    @GetMapping("/wx/cards/{id}")
-    public ResponseBean getCardDetail(@PathVariable String id, HttpServletRequest request) {
-        if (isEmpty(id)) {
-            return ResponseBean.error("参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-
-        String openid = JWTUtils.getSubject(request);
-
-        return taPersonService.getCardDetail(openid, id);
-    }
-
-    /**
-     * 找回密码
-     * @param plat 平台类型 wx 是微信相关, admin 是后台管理系统
-     * @param paramStr
-     * @return
-     */
-    @PostMapping("/{plat}/resetPass")
-    public ResponseBean resetPassword(@PathVariable String plat, @RequestBody String paramStr) {
-        JSONObject params = JSONObject.parseObject(paramStr);
-        String phone = (String) params.get("phone");
-        String code = (String) params.get("code");
-        String pass = (String) params.get("pass");
-
-        if (isEmpty(phone) || isEmpty(code) || isEmpty(pass)) {
-            return ResponseBean.error("参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-
-        // todo
-        // 验证 验证码是否正确
-        if (code != "1234") {
-            return ResponseBean.error("验证码不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-
-        return taPersonService.resetPassword(phone, pass, plat);
-    }
-
-
-    /**
-     *
-     *  以下是经纪人部分
-     *
-     */
-
-
-    /**
-     * 注册经纪人
-     * @param paramStr
-     * @param request
-     * @return
-     */
-    @PostMapping("/wx/register")
-    public ResponseBean resgiteAgent(@RequestBody String paramStr, HttpServletRequest request) {
-        JSONObject params = JSONObject.parseObject(paramStr);
-        String name = (String) params.get("name");
-        String phone = (String) params.get("phone");
-        Integer sex = (Integer) params.get("sex");
-        String explain = (String) params.get("explain");
-
-        if (isEmpty(name) || isEmpty(phone) || isEmpty(explain)) {
-            return ResponseBean.error("请检查部分参数不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-
-        // 当前人员
-        String openid = JWTUtils.getSubject(request);
-
-        return taPersonService.resgiteAgent(name, phone, sex, explain, openid);
-    }
-
-    /**
-     * 生成海报
-     * @param paramStr
-     * @param request
-     * @return
-     */
-    @PostMapping("/wx/poster")
-    public ResponseBean genPoster(@RequestBody String paramStr, HttpServletRequest request) {
-        return null;
-    }
-
-
-    /**
-     *
-     * 以下是个人中心部分
-     *
-     */
-
-    /**
-     * 获取个人信息
-     * @param request
-     * @return
-     */
-    @GetMapping("/wx/user/info")
-    public ResponseBean getUserInfo(HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
-
-        return taPersonService.getWxUser(openid);
-    }
-
-    /**
-     * 个人签到
-     * @param request
-     * @return
-     */
-    @PostMapping("/wx/user/signin")
-    public ResponseBean userSign(HttpServletRequest request) {
-        String openid = JWTUtils.getSubject(request);
-
-        return taPersonService.getWxUserSign(openid);
-    }
-
-
-    /**
-     *
-     *
-     *  以下是系统用户管理
-     *
-     */
-
-    /**
-     * 用户手机号登录
-     * @param paramStr
-     * @return
-     */
-    @PostMapping("/admin/signin")
-    public ResponseBean signin(@RequestBody String paramStr) {
-        JSONObject params = JSONObject.parseObject(paramStr);
-        if (params == null) {
-            return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
-        }
-
-        String userPhone = params.getString("phone");
-        String userCaptcha = params.getString("captcha");
-
-        // todo
-        if (!"1234".equals(userCaptcha)) {
-            return ResponseBean.error("验证码不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-
-        TaPerson taPerson = taPersonService.getPersonByTel(userPhone);
-        if (taPerson == null) {
-            return ResponseBean.error("手机号不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-
-        if (taPerson.getStatus() != CommConstant.STATUS_NORMAL) {
-            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
-        }
-
-        String token = JWTUtils.newToken(taPerson.getPersonId());
-
-        Map<String, Object> result = new HashMap<>();
-        result.put("token", token);
-        result.put("person", taPerson);
-
-        return ResponseBean.success(result);
-    }
-
-    /**
-     * 获取当前用户
-     * @param request
-     * @return
-     */
-    @GetMapping("/admin/user/current")
-    public ResponseBean getCurrentPerson(HttpServletRequest request) {
-        String personId = JWTUtils.getSubject(request);
-        TaPerson taPerson = taPersonService.getById(personId);
-        if (null == taPerson || taPerson.getStatus() != CommConstant.STATUS_NORMAL) {
-            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_AUTH_EXPIRED);
-        }
-
-        return ResponseBean.success(taPerson);
-    }
-
-    @GetMapping("/admin/consultant")
-    public ResponseBean getConsultantList(
-            Integer pageNumber,
-            Integer pageSize,
-            String name,
-            String phone
-    ) {
-        if (null == pageNumber) pageNumber = 1;
-        if (null == pageSize) pageSize = 10;
-
-        IPage<TaPerson> taPersonIPage = taPersonService.getPersonList(pageNumber, pageSize, CommConstant.PERSON_REALTY_CONSULTANT, name, phone);
-        return ResponseBean.success(taPersonIPage);
-    }
-
-    @GetMapping("/admin/consultant/{id}")
-    public ResponseBean getConsultant(@PathVariable String id) {
-        TaPerson taPerson = taPersonService.getById(id);
-
-        List<TaPersonBuilding> buildings = taPersonService.getPersonBuildings(id);
-        if (null != buildings && buildings.size() > 0) {
-            List<String> projects = new ArrayList<>();
-            for (TaPersonBuilding b : buildings) {
-                projects.add(b.getBuildingId());
-            }
-            taPerson.setProjects(projects);
-        }
-
-        return ResponseBean.success(taPerson);
-    }
-
-    @PostMapping("/admin/consultant")
-    public ResponseBean newConsultant(@RequestBody String paramStr) {
-        return taPersonService.newConsultant(paramStr);
-    }
-
-    @PutMapping("/admin/consultant/{id}")
-    public ResponseBean editConsultant(@PathVariable String id, @RequestBody String paramStr) {
-        return taPersonService.editConsultant(id, paramStr);
-    }
-
-    boolean isEmpty(String str) {
-        return null == str || "".equals(str.trim());
-    }
-
-    /**
-//     * 获取收藏置业顾问列表
-//     * @param pageNumber
-//     * @param pageSize
-//     * @return
-//     */
-//    @GetMapping("/wx/savedPerson")
-//    public ResponseBean getSavedConsaultants(@RequestParam(defaultValue = "1") int pageNumber,
-//                                    @RequestParam(defaultValue = "10") int pageSize,HttpServletRequest request) {
-//        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 (pageNumber < 0 || pageSize < 0) {
-//            return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
-//        }
-//        try {
-//            IPage<TaPerson> result = taPersonService.getSavedConsaultants(pageNumber,pageSize,person.getPersonId());
-//            return ResponseBean.success(result);
-//        }catch (Exception e){
-//            e.printStackTrace();
-//            return ResponseBean.error("查询失败", ResponseBean.ERROR_UNAVAILABLE);
-//        }
-//
-//    }
-    /**
-     * 获取我参加过的活动列表
-     * @param pageNumber
-     * @param pageSize
-     * @return
-     */
-    @GetMapping("/wx/joinedActivity/")
-    public ResponseBean getJoinedActivity(@RequestParam(defaultValue = "1") int pageNumber,
-                                             @RequestParam(defaultValue = "10") int pageSize,HttpServletRequest request){
-        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 (pageNumber < 0 || pageSize < 0) {
-            return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-        try {
-            IPage<TaBuildingDynamic> result = taPersonService.getJoinedActivity(pageNumber,pageSize,person.getPhone(),"");
-            return ResponseBean.success(result);
-        }catch (Exception e){
-            e.printStackTrace();
-            return ResponseBean.error("查询失败", ResponseBean.ERROR_UNAVAILABLE);
-        }
-
-    }
-
-
-}
+package com.huiju.estateagents.controller;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.entity.TaBuildingDynamic;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.service.ITaPersonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.huiju.estateagents.base.BaseController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 人员表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@RestController
+@RequestMapping("/api")
+public class TaPersonController extends BaseController {
+    @Autowired
+    ITaPersonService taPersonService;
+
+    /**
+     *
+     *  因为人员表是集合系统的所有种类的用户，包含了各种角色。因此各种角色的操作都在本 controller 中完成
+     *  以下是置业顾问卡片内容
+     *
+     */
+
+    /**
+     * 获取卡片列表
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/wx/cards")
+    public ResponseBean getCardList(@RequestParam(defaultValue = "1") int pageNumber,
+                                    @RequestParam(defaultValue = "10") int pageSize,
+                                    @RequestParam(defaultValue = "false") boolean mine,HttpServletRequest request) {
+        if (pageNumber < 0 || pageSize < 0) {
+            return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        if (mine){
+            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);
+            IPage<Map<String, Object>>  result = taPersonService.getSavedConsaultants(pageNumber,pageSize,person.getPersonId());
+            return ResponseBean.success(result);
+        }else {
+            IPage<Map<String, Object>> result = taPersonService.getCardList(pageNumber, pageSize);
+            return ResponseBean.success(result);
+        }
+
+
+    }
+
+    /**
+     * 绑定卡片
+     * @param paramStr
+     * @return
+     */
+    @PostMapping("/wx/cards/apply")
+    public ResponseBean applyCard(@RequestBody String paramStr, HttpServletRequest request) {
+        JSONObject params = JSONObject.parseObject(paramStr);
+        String phone = (String) params.get("phone");
+        String pass = (String) params.get("pass");
+        String openid = JWTUtils.getSubject(request);
+
+        if (isEmpty(phone) || isEmpty(pass)) {
+            return ResponseBean.error("参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        ResponseBean resp = taPersonService.checkPhoneAndPass(phone, pass);
+
+        // 成功返回空数据
+        if (resp.getCode() != ResponseBean.CODE_SUCCESS) {
+            return resp;
+        }
+
+        return taPersonService.bindCard(phone, pass, openid);
+    }
+
+    /**
+     * 获取名片详情
+     * @param id
+     * @return
+     */
+    @GetMapping("/wx/cards/{id}")
+    public ResponseBean getCardDetail(@PathVariable String id, HttpServletRequest request) {
+        if (isEmpty(id)) {
+            return ResponseBean.error("参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        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);
+
+        return taPersonService.getCardDetail(openid, id,person.getPersonId());
+    }
+
+    /**
+     * 找回密码
+     * @param plat 平台类型 wx 是微信相关, admin 是后台管理系统
+     * @param paramStr
+     * @return
+     */
+    @PostMapping("/{plat}/resetPass")
+    public ResponseBean resetPassword(@PathVariable String plat, @RequestBody String paramStr) {
+        JSONObject params = JSONObject.parseObject(paramStr);
+        String phone = (String) params.get("phone");
+        String code = (String) params.get("code");
+        String pass = (String) params.get("pass");
+
+        if (isEmpty(phone) || isEmpty(code) || isEmpty(pass)) {
+            return ResponseBean.error("参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        // todo
+        // 验证 验证码是否正确
+        if (code != "1234") {
+            return ResponseBean.error("验证码不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        return taPersonService.resetPassword(phone, pass, plat);
+    }
+
+
+    /**
+     *
+     *  以下是经纪人部分
+     *
+     */
+
+
+    /**
+     * 注册经纪人
+     * @param paramStr
+     * @param request
+     * @return
+     */
+    @PostMapping("/wx/register")
+    public ResponseBean resgiteAgent(@RequestBody String paramStr, HttpServletRequest request) {
+        JSONObject params = JSONObject.parseObject(paramStr);
+        String name = (String) params.get("name");
+        String phone = (String) params.get("phone");
+        Integer sex = (Integer) params.get("sex");
+        String explain = (String) params.get("explain");
+
+        if (isEmpty(name) || isEmpty(phone) || isEmpty(explain)) {
+            return ResponseBean.error("请检查部分参数不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        // 当前人员
+        String openid = JWTUtils.getSubject(request);
+
+        return taPersonService.resgiteAgent(name, phone, sex, explain, openid);
+    }
+
+    /**
+     * 生成海报
+     * @param paramStr
+     * @param request
+     * @return
+     */
+    @PostMapping("/wx/poster")
+    public ResponseBean genPoster(@RequestBody String paramStr, HttpServletRequest request) {
+        return null;
+    }
+
+
+    /**
+     *
+     * 以下是个人中心部分
+     *
+     */
+
+    /**
+     * 获取个人信息
+     * @param request
+     * @return
+     */
+    @GetMapping("/wx/user/info")
+    public ResponseBean getUserInfo(HttpServletRequest request) {
+        String openid = JWTUtils.getSubject(request);
+
+        return taPersonService.getWxUser(openid);
+    }
+
+    /**
+     * 个人签到
+     * @param request
+     * @return
+     */
+    @PostMapping("/wx/user/signin")
+    public ResponseBean userSign(HttpServletRequest request) {
+        String openid = JWTUtils.getSubject(request);
+
+        return taPersonService.getWxUserSign(openid);
+    }
+
+
+    /**
+     *
+     *
+     *  以下是系统用户管理
+     *
+     */
+
+    /**
+     * 用户手机号登录
+     * @param paramStr
+     * @return
+     */
+    @PostMapping("/admin/signin")
+    public ResponseBean signin(@RequestBody String paramStr) {
+        JSONObject params = JSONObject.parseObject(paramStr);
+        if (params == null) {
+            return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        String userPhone = params.getString("phone");
+        String userCaptcha = params.getString("captcha");
+
+        // todo
+        if (!"1234".equals(userCaptcha)) {
+            return ResponseBean.error("验证码不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaPerson taPerson = taPersonService.getPersonByTel(userPhone);
+        if (taPerson == null) {
+            return ResponseBean.error("手机号不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (taPerson.getStatus() != CommConstant.STATUS_NORMAL) {
+            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        String token = JWTUtils.newToken(taPerson.getPersonId());
+
+        Map<String, Object> result = new HashMap<>();
+        result.put("token", token);
+        result.put("person", taPerson);
+
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 获取当前用户
+     * @param request
+     * @return
+     */
+    @GetMapping("/admin/user/current")
+    public ResponseBean getCurrentPerson(HttpServletRequest request) {
+        String personId = JWTUtils.getSubject(request);
+        TaPerson taPerson = taPersonService.getById(personId);
+        if (null == taPerson || taPerson.getStatus() != CommConstant.STATUS_NORMAL) {
+            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_AUTH_EXPIRED);
+        }
+
+        return ResponseBean.success(taPerson);
+    }
+
+    @GetMapping("/admin/consultant")
+    public ResponseBean getConsultantList(
+            Integer pageNumber,
+            Integer pageSize,
+            String name,
+            String phone
+    ) {
+        if (null == pageNumber) pageNumber = 1;
+        if (null == pageSize) pageSize = 10;
+
+        IPage<TaPerson> taPersonIPage = taPersonService.getPersonList(pageNumber, pageSize, CommConstant.PERSON_REALTY_CONSULTANT, name, phone);
+        return ResponseBean.success(taPersonIPage);
+    }
+
+    @GetMapping("/admin/consultant/{id}")
+    public ResponseBean getConsultant(@PathVariable String id) {
+        TaPerson taPerson = taPersonService.getById(id);
+
+        List<TaPersonBuilding> buildings = taPersonService.getPersonBuildings(id);
+        if (null != buildings && buildings.size() > 0) {
+            List<String> projects = new ArrayList<>();
+            for (TaPersonBuilding b : buildings) {
+                projects.add(b.getBuildingId());
+            }
+            taPerson.setProjects(projects);
+        }
+
+        return ResponseBean.success(taPerson);
+    }
+
+    @PostMapping("/admin/consultant")
+    public ResponseBean newConsultant(@RequestBody String paramStr) {
+        return taPersonService.newConsultant(paramStr);
+    }
+
+    @PutMapping("/admin/consultant/{id}")
+    public ResponseBean editConsultant(@PathVariable String id, @RequestBody String paramStr) {
+        return taPersonService.editConsultant(id, paramStr);
+    }
+
+    boolean isEmpty(String str) {
+        return null == str || "".equals(str.trim());
+    }
+
+    /**
+//     * 获取收藏置业顾问列表
+//     * @param pageNumber
+//     * @param pageSize
+//     * @return
+//     */
+//    @GetMapping("/wx/savedPerson")
+//    public ResponseBean getSavedConsaultants(@RequestParam(defaultValue = "1") int pageNumber,
+//                                    @RequestParam(defaultValue = "10") int pageSize,HttpServletRequest request) {
+//        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 (pageNumber < 0 || pageSize < 0) {
+//            return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+//        }
+//        try {
+//            IPage<TaPerson> result = taPersonService.getSavedConsaultants(pageNumber,pageSize,person.getPersonId());
+//            return ResponseBean.success(result);
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            return ResponseBean.error("查询失败", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//
+//    }
+    /**
+     * 获取我参加过的活动列表
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/wx/joinedActivity/")
+    public ResponseBean getJoinedActivity(@RequestParam(defaultValue = "1") int pageNumber,
+                                             @RequestParam(defaultValue = "10") int pageSize,HttpServletRequest request){
+        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 (pageNumber < 0 || pageSize < 0) {
+            return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        try {
+            IPage<TaBuildingDynamic> result = taPersonService.getJoinedActivity(pageNumber,pageSize,person.getPhone(),"");
+            return ResponseBean.success(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error("查询失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+    }
+
+
+}

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

@@ -1,222 +1,225 @@
-package com.huiju.estateagents.entity;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 项目表
- * </p>
- *
- * @author jobob
- * @since 2019-05-10
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class TaBuilding implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 项目ID
-     */
-    @TableId(value = "building_id", type = IdType.UUID)
-    private String buildingId;
-
-    /**
-     * 项目名称
-     */
-    private String buildingName;
-
-    /**
-     * 别名
-     */
-    private String name;
-
-    /**
-     * 价格
-     */
-    private String price;
-
-    /**
-     * 开盘时间
-     */
-    private LocalDateTime openingDate;
-
-    /**
-     * 项目地址
-     */
-    private String address;
-
-    /**
-     * 项目坐标
-     */
-    private String coordinate;
-
-    /**
-     * 物业类型
-     */
-    private String propertyType;
-
-    /**
-     * 最近动态
-     */
-    private String dynamic;
-
-    /**
-     * 电话
-     */
-    private String tel;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createDate;
-
-    /**
-     * 状态
-     */
-    private Integer status;
-
-    /**
-     * 编号
-     */
-    private String code;
-
-    /**
-     * 发布时间
-     */
-    private LocalDateTime releaseTime;
-
-    /**
-     * 销售状态
-     */
-    private String marketStatus;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 显示顺序
-     */
-    private Integer orderNo;
-
-    /**
-     * 楼盘优惠信息
-     */
-    private String discount;
-
-    /**
-     * 是否主推楼盘
-     */
-    private Integer isMain;
-
-    /**
-     * 楼盘状态
-     */
-    private String buildingStatus;
-
-    /**
-     * 楼盘区域
-     */
-    private String buildingArea;
-
-    /**
-     * 楼盘地图图片
-     */
-    private String mapImg;
-
-    /**
-     * 海报底图
-     */
-    private String poster;
-
-    private String buildingTransport;
-
-    private String buildingMall;
-
-    private String buildingEdu;
-
-    private String buildingHospital;
-
-    private String buildingBank;
-
-    private String buildingRestaurant;
-
-    private String greeningRate;
-
-    private String buildingType;
-
-    private String serviceCompany;
-
-    private String serviceFee;
-
-    private String decoration;
-
-    private LocalDateTime receivedDate;
-
-    private String preSalePermit;
-
-    private Integer rightsYear;
-
-    private Integer familyNum;
-
-    private String parkingRate;
-
-    private String volumeRate;
-
-    private Integer favorNum;
-    private Integer pvNum;
-    private Integer saveNum;
-    private Integer shareNum;
-
-
-    /**
-     * 图片
-     */
-    @TableField(exist = false)
-    private List<TaBuildingImg> BuildingImg;
-
-    /**
-     * 标签
-     */
-    @TableField(exist = false)
-    private List<TaBuildingTag> BuildingTag;
-
-    /**
-     * 户型
-     */
-    @TableField(exist = false)
-    private List<TaBuildingApartment> buildingApartment;
-
-    /**
-     * 来访记录
-     */
-//    @TableField(exist = false)
-//    private List<TaVisit> visits;
-
-    @TableField(exist = false)
-    private IPage<TaUv> uvList;
-
-    @TableField(exist = false)
-    private IPage<TaShare> shareList;
-
-
-    @TableField(exist = false)
-    private List<Map<String, Object>> consultants;
-
-    private Integer cityId;
-}
+package com.huiju.estateagents.entity;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 项目表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaBuilding implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目ID
+     */
+    @TableId(value = "building_id", type = IdType.UUID)
+    private String buildingId;
+
+    /**
+     * 项目名称
+     */
+    private String buildingName;
+
+    /**
+     * 别名
+     */
+    private String name;
+
+    /**
+     * 价格
+     */
+    private String price;
+
+    /**
+     * 开盘时间
+     */
+    private LocalDateTime openingDate;
+
+    /**
+     * 项目地址
+     */
+    private String address;
+
+    /**
+     * 项目坐标
+     */
+    private String coordinate;
+
+    /**
+     * 物业类型
+     */
+    private String propertyType;
+
+    /**
+     * 最近动态
+     */
+    private String dynamic;
+
+    /**
+     * 电话
+     */
+    private String tel;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 编号
+     */
+    private String code;
+
+    /**
+     * 发布时间
+     */
+    private LocalDateTime releaseTime;
+
+    /**
+     * 销售状态
+     */
+    private String marketStatus;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 显示顺序
+     */
+    private Integer orderNo;
+
+    /**
+     * 楼盘优惠信息
+     */
+    private String discount;
+
+    /**
+     * 是否主推楼盘
+     */
+    private Integer isMain;
+
+    /**
+     * 楼盘状态
+     */
+    private String buildingStatus;
+
+    /**
+     * 楼盘区域
+     */
+    private String buildingArea;
+
+    /**
+     * 楼盘地图图片
+     */
+    private String mapImg;
+
+    /**
+     * 海报底图
+     */
+    private String poster;
+
+    private String buildingTransport;
+
+    private String buildingMall;
+
+    private String buildingEdu;
+
+    private String buildingHospital;
+
+    private String buildingBank;
+
+    private String buildingRestaurant;
+
+    private String greeningRate;
+
+    private String buildingType;
+
+    private String serviceCompany;
+
+    private String serviceFee;
+
+    private String decoration;
+
+    private LocalDateTime receivedDate;
+
+    private String preSalePermit;
+
+    private Integer rightsYear;
+
+    private Integer familyNum;
+
+    private String parkingRate;
+
+    private String volumeRate;
+
+    private Integer favorNum;
+    private Integer pvNum;
+    private Integer saveNum;
+    private Integer shareNum;
+
+
+    /**
+     * 图片
+     */
+    @TableField(exist = false)
+    private List<TaBuildingImg> BuildingImg;
+
+    /**
+     * 标签
+     */
+    @TableField(exist = false)
+    private List<TaBuildingTag> BuildingTag;
+
+    /**
+     * 户型
+     */
+    @TableField(exist = false)
+    private List<TaBuildingApartment> buildingApartment;
+
+    /**
+     * 来访记录
+     */
+//    @TableField(exist = false)
+//    private List<TaVisit> visits;
+
+    @TableField(exist = false)
+    private IPage<TaUv> uvList;
+
+    @TableField(exist = false)
+    private IPage<TaShare> shareList;
+
+
+    @TableField(exist = false)
+    private List<Map<String, Object>> consultants;
+
+    private Integer cityId;
+
+    @TableField(exist = false)
+    private Integer isSave;
+}

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

@@ -1,106 +1,109 @@
-package com.huiju.estateagents.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 资讯表 
- * </p>
- *
- * @author jobob
- * @since 2019-07-25
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class TaNews implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 咨询ID
-     */
-    @TableId(value = "news_id", type = IdType.AUTO)
-    private Integer newsId;
-
-    /**
-     * 公司id
-     */
-    private Integer orgId;
-
-    /**
-     * 楼盘id
-     */
-    private String buildingId;
-
-    /**
-     * 资讯图片
-     */
-    private String newsImg;
-
-    /**
-     * 资讯标题
-     */
-    private String newsName;
-
-    /**
-     * 资讯类型id
-     */
-    private Integer newsTypeId;
-
-    /**
-     * 资讯详情类型 0是链接1是自定义
-     */
-    private String newsDetailType;
-
-    /**
-     * 资讯详情 0的情况下存链接，1的情况下存富文本
-     */
-    private String newsDetail;
-
-    /**
-     * 资讯状态 0是已发布1是未发布
-     */
-    private Integer newsStatus;
-
-    /**
-     * 状态
-     */
-    private Integer status;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createDate;
-
-    /**
-     * 阅读量
-     */
-    private Integer pvNum;
-
-    /**
-     * 点赞量
-     */
-    private Integer favorNum;
-
-    /**
-     * 收藏量
-     */
-    private Integer saveNum;
-
-    /**
-     * 类型
-     */
-    @TableField(exist = false)
-    private TaNewsType newsType;
-
-    private Integer cityId;
-}
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 资讯表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaNews implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 咨询ID
+     */
+    @TableId(value = "news_id", type = IdType.AUTO)
+    private Integer newsId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 资讯图片
+     */
+    private String newsImg;
+
+    /**
+     * 资讯标题
+     */
+    private String newsName;
+
+    /**
+     * 资讯类型id
+     */
+    private Integer newsTypeId;
+
+    /**
+     * 资讯详情类型 0是链接1是自定义
+     */
+    private String newsDetailType;
+
+    /**
+     * 资讯详情 0的情况下存链接，1的情况下存富文本
+     */
+    private String newsDetail;
+
+    /**
+     * 资讯状态 0是已发布1是未发布
+     */
+    private Integer newsStatus;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 阅读量
+     */
+    private Integer pvNum;
+
+    /**
+     * 点赞量
+     */
+    private Integer favorNum;
+
+    /**
+     * 收藏量
+     */
+    private Integer saveNum;
+
+    /**
+     * 类型
+     */
+    @TableField(exist = false)
+    private TaNewsType newsType;
+
+    private Integer cityId;
+
+    @TableField(exist = false)
+    private Integer isSave;
+}

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

@@ -1,230 +1,233 @@
-package com.huiju.estateagents.entity;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.List;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 人员表
- * </p>
- *
- * @author jobob
- * @since 2019-05-10
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class TaPerson implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 人员ID
-     */
-
-    @TableId(value = "person_id", type = IdType.UUID)
-    private String personId;
-
-    /**
-     * 人员类型
-     */
-    private String personType;
-
-    /**
-     * 密码
-     */
-    private String password;
-
-    /**
-     * 姓名
-     */
-    private String name;
-
-    /**
-     * 电话
-     */
-    private String tel;
-
-    /**
-     * 性别
-     */
-    private Integer sex;
-
-    /**
-     * 邮箱
-     */
-    private String email;
-
-    /**
-     * 地址
-     */
-    private String address;
-
-    /**
-     * 身份证号
-     */
-    private String idNo;
-
-    /**
-     * 公司
-     */
-    private String company;
-
-    /**
-     * 部门
-     */
-    private String department;
-
-    /**
-     * 职位
-     */
-    private String post;
-
-    /**
-     * 照片
-     */
-    private String photo;
-
-    /**
-     * 状态
-     */
-    private Integer status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createDate;
-
-    /**
-     * 人气
-     */
-    private Integer hotNum;
-
-    /**
-     * 分享
-     */
-    private Integer shareNum;
-
-    /**
-     * 点赞
-     */
-    private Integer likeNum;
-
-    /**
-     * 浏览量
-     */
-    private Integer pvNum;
-
-    /**
-     * 小程序ID
-     */
-    private String miniOpenid;
-
-    /**
-     * 微信昵称
-     */
-    private String nickname;
-
-    /**
-     * 微信头像
-     */
-    private String avatarurl;
-
-    /**
-     * 微信手机
-     */
-    private String phone;
-
-    /**
-     * 海报背景
-     */
-    private String poster;
-
-    /**
-     * 是否注册
-     */
-    private Integer isSignup;
-
-    /**
-     * 身份说明
-     */
-    private String idRemark;
-
-    /**
-     * 名片图片
-     */
-    private String cardImg;
-
-    /**
-     * 注册审核
-     */
-    private Integer signupStatus;
-
-    /**
-     * 审核结果说明
-     */
-    private String verifyDesc;
-
-    /**
-     * 累计积分
-     */
-    private Integer points;
-
-    /**
-     * 访问记录
-     */
-    @TableField(exist = false)
-    private List<TaPersonVisitRecord> visitRecords;
-
-    @TableField(exist = false)
-    private List<String> projects;
-
-    @TableField(exist = false)
-    private String data;
-
-    @TableField(exist = false)
-    private String event;
-
-    @TableField(exist = false)
-    private String activity;
-
-    @TableField(exist = false)
-    private LocalDateTime visitTime;
-
-    private String personTags;
-
-    private String personDescription;
-
-    private String gender;
-
-    private String unionId;
-
-    private String country;
-
-    private String province;
-
-    private String city;
-
-    private String language;
-
-    private Integer saveNum;
-
-    private String recommendPerson;
-
-    private String recommendPersonType;
-
-    private String fromCode;
-}
+package com.huiju.estateagents.entity;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 人员表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaPerson implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 人员ID
+     */
+
+    @TableId(value = "person_id", type = IdType.UUID)
+    private String personId;
+
+    /**
+     * 人员类型
+     */
+    private String personType;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 电话
+     */
+    private String tel;
+
+    /**
+     * 性别
+     */
+    private Integer sex;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 身份证号
+     */
+    private String idNo;
+
+    /**
+     * 公司
+     */
+    private String company;
+
+    /**
+     * 部门
+     */
+    private String department;
+
+    /**
+     * 职位
+     */
+    private String post;
+
+    /**
+     * 照片
+     */
+    private String photo;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 人气
+     */
+    private Integer hotNum;
+
+    /**
+     * 分享
+     */
+    private Integer shareNum;
+
+    /**
+     * 点赞
+     */
+    private Integer likeNum;
+
+    /**
+     * 浏览量
+     */
+    private Integer pvNum;
+
+    /**
+     * 小程序ID
+     */
+    private String miniOpenid;
+
+    /**
+     * 微信昵称
+     */
+    private String nickname;
+
+    /**
+     * 微信头像
+     */
+    private String avatarurl;
+
+    /**
+     * 微信手机
+     */
+    private String phone;
+
+    /**
+     * 海报背景
+     */
+    private String poster;
+
+    /**
+     * 是否注册
+     */
+    private Integer isSignup;
+
+    /**
+     * 身份说明
+     */
+    private String idRemark;
+
+    /**
+     * 名片图片
+     */
+    private String cardImg;
+
+    /**
+     * 注册审核
+     */
+    private Integer signupStatus;
+
+    /**
+     * 审核结果说明
+     */
+    private String verifyDesc;
+
+    /**
+     * 累计积分
+     */
+    private Integer points;
+
+    /**
+     * 访问记录
+     */
+    @TableField(exist = false)
+    private List<TaPersonVisitRecord> visitRecords;
+
+    @TableField(exist = false)
+    private List<String> projects;
+
+    @TableField(exist = false)
+    private String data;
+
+    @TableField(exist = false)
+    private String event;
+
+    @TableField(exist = false)
+    private String activity;
+
+    @TableField(exist = false)
+    private LocalDateTime visitTime;
+
+    private String personTags;
+
+    private String personDescription;
+
+    private String gender;
+
+    private String unionId;
+
+    private String country;
+
+    private String province;
+
+    private String city;
+
+    private String language;
+
+    private Integer saveNum;
+
+    private String recommendPerson;
+
+    private String recommendPersonType;
+
+    private String fromCode;
+
+    @TableField(exist = false)
+    private Integer isSave;
+}

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

@@ -36,7 +36,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param id
      * @return
      */
-    ResponseBean buildingAllSelectId(String id);
+    ResponseBean buildingAllSelectId(String id,String personId);
 
 
     /**

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

@@ -61,7 +61,7 @@ public interface ITaNewsService extends IService<TaNews> {
      * @param newsId
      * @return
      */
-    ResponseBean getWxTaNewsById(Integer newsId);
+    ResponseBean getWxTaNewsById(Integer newsId,String personId);
 
     /**
      * 微信 阅读量 +1

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

@@ -1,66 +1,66 @@
-package com.huiju.estateagents.service;
-
-import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.entity.TaBuildingDynamic;
-import com.huiju.estateagents.entity.TaPerson;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.huiju.estateagents.entity.TaPersonBuilding;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 人员表 服务类
- * </p>
- *
- * @author jobob
- * @since 2019-05-10
- */
-public interface ITaPersonService extends IService<TaPerson> {
-    TaPerson mergePersonWxInfo(WxMaUserInfo userInfo);
-
-    TaPerson updatePersonPhone(String miniOpenid, String phone);
-
-    IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize);
-
-    ResponseBean checkPhoneAndPass(String phone, String pass);
-
-    ResponseBean resetPassword(String phone, String pass, String plat);
-
-    ResponseBean getCardDetail(String openid, String id);
-
-    ResponseBean resgiteAgent(String name, String phone, Integer sex, String explain, String openid);
-
-    ResponseBean getWxUser(String openid);
-
-    ResponseBean getWxUserSign(String openid);
-
-    TaPerson getPersonByTel(String userPhone);
-
-    IPage<TaPerson> getPersonList(int pageNumber, int pageSize, String personType, String name, String phone);
-
-    TaPerson newPersonByOpenid(String openid);
-
-    ResponseBean bindCard(String phone, String pass, String openid);
-
-    ResponseBean newConsultant(String paramStr);
-
-    ResponseBean editConsultant(String id, String paramStr);
-
-    Map<String,Object> getExtraInfo(String personId);
-
-    List<TaPerson> getPersonsByOpenId(String openid);
-
-    IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building);
-
-    String getPersonIdByCustomerId(String customerId);
-
-    IPage<Map<String,Object>> getSavedConsaultants(int pageNumber, int pageSize,String personId);
-
-    IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String phone,String building);
-
-    List<TaPersonBuilding> getPersonBuildings(String personId);
-}
+package com.huiju.estateagents.service;
+
+import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaBuildingDynamic;
+import com.huiju.estateagents.entity.TaPerson;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 人员表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+public interface ITaPersonService extends IService<TaPerson> {
+    TaPerson mergePersonWxInfo(WxMaUserInfo userInfo);
+
+    TaPerson updatePersonPhone(String miniOpenid, String phone);
+
+    IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize);
+
+    ResponseBean checkPhoneAndPass(String phone, String pass);
+
+    ResponseBean resetPassword(String phone, String pass, String plat);
+
+    ResponseBean getCardDetail(String openid, String id,String personId);
+
+    ResponseBean resgiteAgent(String name, String phone, Integer sex, String explain, String openid);
+
+    ResponseBean getWxUser(String openid);
+
+    ResponseBean getWxUserSign(String openid);
+
+    TaPerson getPersonByTel(String userPhone);
+
+    IPage<TaPerson> getPersonList(int pageNumber, int pageSize, String personType, String name, String phone);
+
+    TaPerson newPersonByOpenid(String openid);
+
+    ResponseBean bindCard(String phone, String pass, String openid);
+
+    ResponseBean newConsultant(String paramStr);
+
+    ResponseBean editConsultant(String id, String paramStr);
+
+    Map<String,Object> getExtraInfo(String personId);
+
+    List<TaPerson> getPersonsByOpenId(String openid);
+
+    IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building);
+
+    String getPersonIdByCustomerId(String customerId);
+
+    IPage<Map<String,Object>> getSavedConsaultants(int pageNumber, int pageSize,String personId);
+
+    IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String phone,String building);
+
+    List<TaPersonBuilding> getPersonBuildings(String personId);
+}

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

@@ -99,7 +99,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean buildingAllSelectId(String id) {
+    public ResponseBean buildingAllSelectId(String id,String personId) {
         // 查询基础信息
         QueryWrapper<TaBuilding> buildingtWrapper = new QueryWrapper<>();
         buildingtWrapper.lambda().gt(TaBuilding::getStatus,-1);
@@ -138,6 +138,16 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         building.setBuildingApartment(appoint);
 
         getBuildingAttaches(building);
+        QueryWrapper<TaSave> saveQueryWrapper = new QueryWrapper<>();
+        saveQueryWrapper.eq("target_type",CommConstant.FAVOR_PROJECT);
+        saveQueryWrapper.eq("person_id",personId);
+        saveQueryWrapper.eq("saved_target",building.getBuildingId());
+        Integer num = taSaveMapper.selectCount(saveQueryWrapper);
+        if (num>0){
+            building.setIsSave(CommConstant.STATUS_NORMAL);
+        }else {
+            building.setIsSave(CommConstant.STATUS_UNACCALIMED);
+        }
 
         return ResponseBean.success(building);
     }
@@ -344,7 +354,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
                 getBuildingAttaches(build);
             }
         }
-        if(targets.size()<=0 && mine){
+        if(null!=targets&&targets.size()<=0 && mine){
             return ResponseBean.success(null);
         }else {
             return ResponseBean.success(result);

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

@@ -6,16 +6,20 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.BeanTools;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaNews;
 import com.huiju.estateagents.entity.TaNewsType;
+import com.huiju.estateagents.entity.TaSave;
 import com.huiju.estateagents.exception.EstaException;
 import com.huiju.estateagents.mapper.TaFavorMapper;
 import com.huiju.estateagents.mapper.TaNewsMapper;
+import com.huiju.estateagents.mapper.TaSaveMapper;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaNewsService;
 import com.huiju.estateagents.service.ITaNewsTypeService;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -45,6 +49,9 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
     @Autowired
     private TaNewsMapper taNewsMapper;
 
+    @Autowired
+    private TaSaveMapper taSaveMapper;
+
 
     @Override
     public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus) {
@@ -150,7 +157,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
     }
 
     @Override
-    public ResponseBean getWxTaNewsById(Integer newsId) {
+    public ResponseBean getWxTaNewsById(Integer newsId,String personId) {
         ResponseBean responseBean = getTaNewsById(newsId);
         if (1 == responseBean.getCode()) {
             return responseBean;
@@ -158,6 +165,17 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         TaNews taNews = (TaNews) responseBean.getData();
         if (null == taNews) {
             responseBean.addError("数据不存!");
+        }else {
+            QueryWrapper<TaSave> saveQueryWrapper = new QueryWrapper<>();
+            saveQueryWrapper.eq("tagret_type", CommConstant.FAVOR_NEWS);
+            saveQueryWrapper.eq("person_id",personId);
+            saveQueryWrapper.eq("saved_target",taNews.getNewsId());
+            Integer num = taSaveMapper.selectCount(saveQueryWrapper);
+            if (num>0){
+                taNews.setIsSave(CommConstant.STATUS_NORMAL);
+            }else {
+                taNews.setIsSave(CommConstant.STATUS_UNACCALIMED);
+            }
         }
 
         responseBean.addSuccess(taNews);
@@ -194,7 +212,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
 
         injectType(taNewsIPage.getRecords());
-        if (targets.size()<=0 && mine){
+        if (null != targets&&targets.size()<=0 && mine){
             return null;
         }else {
             return page;

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

@@ -192,7 +192,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public ResponseBean getCardDetail(String openid, String id) {
+    public ResponseBean getCardDetail(String openid, String id,String personId) {
         // 卡片人员
         TaPerson person = taPersonMapper.selectById(id);
         if (null == person) {
@@ -233,6 +233,16 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         result.put("projects", buildings);
         result.put("address", person.getAddress());
         result.put("personTags",person.getPersonTags());
+        QueryWrapper<TaSave> saveQueryWrapper = new QueryWrapper<>();
+        saveQueryWrapper.eq("tagret_type", CommConstant.FAVOR_CONSULTANT);
+        saveQueryWrapper.eq("person_id",personId);
+        saveQueryWrapper.eq("saved_target",person.getPersonId());
+        Integer num = taSaveMapper.selectCount(saveQueryWrapper);
+        Integer save = 0;
+        if (num>0){
+            save=CommConstant.STATUS_NORMAL;
+        }
+        result.put("isSave",save);
 
         // 当前人员
         List<TaPerson> taPersonList = getPersonsByOpenId(openid);