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

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

@@ -7,6 +7,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.WxUtils;
 import com.huiju.estateagents.entity.TaCustomerPerson;
 import com.huiju.estateagents.entity.TaMiniappQrcode;
@@ -62,7 +63,7 @@ public class MiniAppController {
      * 登陆接口
      */
     @PostMapping("/login")
-    public ResponseBean login(String code) {
+    public ResponseBean login(String code,@RequestParam(required = false) String from,@RequestParam(required = false)String recommender) {
         if (StringUtils.isBlank(code)) {
             return ResponseBean.error("参数 code 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
@@ -192,6 +193,8 @@ public class MiniAppController {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
+        person.setPersonType(CommConstant.PERSON_ESTATE_AGENT);
+        taPersonService.updateById(person);
         QueryWrapper<TaRecommendCustomer> cus= new QueryWrapper<>();
         cus.eq("phone",phoneNoInfo.getPhoneNumber());
         List<TaRecommendCustomer> customer = taRecommendCustomerService.list(cus);

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

@@ -60,8 +60,8 @@ public class TaBuildingController extends BaseController {
      * @return
      */
     @GetMapping("/admin/buildinglist")
-    public ResponseBean buildingList(@RequestParam("pageNum")Integer pageNum,
-                                     @RequestParam("pageSize")Integer pageSize,
+    public ResponseBean buildingList(@RequestParam(value = "pageNum", defaultValue = "1")Integer pageNum,
+                                     @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
                                      @RequestParam(value = "name", required = false)String name,
                                      @RequestParam(value = "code", required = false)String code){
         return taBuildingService.buildingList(pageNum,pageSize,name,code);
@@ -173,7 +173,7 @@ public class TaBuildingController extends BaseController {
             targets = iTaSaveService.getTargesOfPerson(persons.get(0).getPersonId(), CommConstant.FAVOR_PROJECT);
         }
 
-        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets, cityId);
+        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets, cityId,mine);
     }
 
     /**
@@ -213,3 +213,4 @@ public class TaBuildingController extends BaseController {
         return taBuilding;
     }
 }
+

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

@@ -94,7 +94,7 @@ public class TaBuildingDynamicController extends BaseController {
         if(mine){
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
             if (null == taPersons || taPersons.size() != 1) {
-                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+                return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
             }
             TaPerson person = taPersons.get(0);
             responseBean.addSuccess(taPersonService.getJoinedActivity(pageNum,pageSize,person.getPhone(),""));

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

@@ -1,166 +1,166 @@
-package com.huiju.estateagents.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.huiju.estateagents.base.BaseController;
-import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.JWTUtils;
-import com.huiju.estateagents.entity.TaNews;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.service.ITaNewsService;
-import com.huiju.estateagents.service.ITaPersonService;
-import com.huiju.estateagents.service.ITaSaveService;
-import org.checkerframework.checker.units.qual.A;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * <p>
-    * 资讯表  前端控制器
-    * </p>
- *
- * @author jobob
- * @since 2019-07-25
- */
-@RestController
-@RequestMapping("/api")
-public class TaNewsController extends BaseController {
-
-    private final Logger logger = LoggerFactory.getLogger(TaNewsController.class);
-
-    @Autowired
-    public ITaNewsService iTaNewsService;
-
-    @Autowired
-    public ITaPersonService iTaPersonService;
-
-    @Autowired
-    public ITaSaveService iTaSaveService;
-
-
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/admin/taNews",method= RequestMethod.GET)
-    public ResponseBean taNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                   @RequestParam(value = "buildingId", required = false) String buildingId,
-                                   @RequestParam(value = "orgId", required = false) Integer orgId,
-                                   @RequestParam(value = "newsTypeId", required = false) Integer newsTypeId,
-                                   @RequestParam(value = "newsStatus", required = false) Integer newsStatus){
-        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, orgId, newsTypeId, newsStatus);
-        return responseBean;
-    }
-
-    /**
-     * 微信 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/wx/taNews",method= RequestMethod.GET)
-    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) Integer cityId,
-                                     @RequestParam(defaultValue = "false") Boolean mine,
-                                     HttpServletRequest request
-    ){
-        List<String> targets = null;
-        if (null != mine && mine) {
-            String openid = JWTUtils.getSubject(request);
-            List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
-            if (null == persons || persons.size() == 0) {
-                return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
-            }
-
-            targets = iTaSaveService.getTargesOfPerson(persons.get(0).getPersonId(), CommConstant.FAVOR_NEWS);
-        }
-
-        IPage<TaNews> results = iTaNewsService.getWxList(pageNum, pageSize, buildingId, targets,cityId);
-        return ResponseBean.success(results);
-    }
-
-    /**
-     * 保存对象
-     * @param taNews 实体对象
-     * @return
-     */
-    @RequestMapping(value="/admin/taNews",method= RequestMethod.POST)
-    public ResponseBean taNewsAdd(@RequestBody TaNews taNews){
-        ResponseBean responseBean = iTaNewsService.addTaNews(taNews);
-        return responseBean;
-    }
-
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @ResponseBody
-    @RequestMapping(value="/admin/taNews/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taNewsDelete(@PathVariable Integer id){
-        ResponseBean responseBean = iTaNewsService.deleteTaNews(id);
-        return responseBean;
-    }
-
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param taNews 实体对象
-     * @return
-     */
-    @RequestMapping(value="/admin/taNews/{id}",method= RequestMethod.PUT)
-    public ResponseBean taNewsUpdate(@PathVariable Integer id,
-                                        @RequestBody TaNews taNews){
-        taNews.setNewsId(id);
-        ResponseBean responseBean = iTaNewsService.updateTaNews(taNews);
-        return responseBean;
-    }
-
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/admin/taNews/{id}",method= RequestMethod.GET)
-    public ResponseBean taNewsGet(@PathVariable Integer id){
-        ResponseBean responseBean = iTaNewsService.getTaNewsById(id);
-        return responseBean;
-    }
-
-    /**
-     * 微信 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/wx/taNews/{id}",method= RequestMethod.GET)
-    public ResponseBean wxTaNewsGet(@PathVariable Integer id){
-        ResponseBean responseBean = iTaNewsService.getWxTaNewsById(id);
-        return responseBean;
-    }
-
-    /**
-     * 微信 资讯阅读量+1
-     * @param id
-     * @return
-     */
-    @RequestMapping(value = "/wx/taNews/pvNum/{id}", method = RequestMethod.PUT)
-    public ResponseBean wxTaPvNum(@PathVariable Integer id) {
-        ResponseBean responseBean = iTaNewsService.wxTaPvNum(id);
-        return responseBean;
-    }
-}
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.entity.TaNews;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.service.ITaNewsService;
+import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.ITaSaveService;
+import org.checkerframework.checker.units.qual.A;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * <p>
+    * 资讯表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@RestController
+@RequestMapping("/api")
+public class TaNewsController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaNewsController.class);
+
+    @Autowired
+    public ITaNewsService iTaNewsService;
+
+    @Autowired
+    public ITaPersonService iTaPersonService;
+
+    @Autowired
+    public ITaSaveService iTaSaveService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taNews",method= RequestMethod.GET)
+    public ResponseBean taNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                   @RequestParam(value = "buildingId", required = false) String buildingId,
+                                   @RequestParam(value = "orgId", required = false) Integer orgId,
+                                   @RequestParam(value = "newsTypeId", required = false) Integer newsTypeId,
+                                   @RequestParam(value = "newsStatus", required = false) Integer newsStatus){
+        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, orgId, newsTypeId, newsStatus);
+        return responseBean;
+    }
+
+    /**
+     * 微信 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/taNews",method= RequestMethod.GET)
+    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) Integer cityId,
+                                     @RequestParam(defaultValue = "false") Boolean mine,
+                                     HttpServletRequest request
+    ){
+        List<String> targets = null;
+        if (null != mine && mine) {
+            String openid = JWTUtils.getSubject(request);
+            List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
+            if (null == persons || persons.size() == 0) {
+                return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
+            }
+
+            targets = iTaSaveService.getTargesOfPerson(persons.get(0).getPersonId(), CommConstant.FAVOR_NEWS);
+        }
+
+        IPage<TaNews> results = iTaNewsService.getWxList(pageNum, pageSize, buildingId, targets,cityId,mine);
+        return ResponseBean.success(results);
+    }
+
+    /**
+     * 保存对象
+     * @param taNews 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taNews",method= RequestMethod.POST)
+    public ResponseBean taNewsAdd(@RequestBody TaNews taNews){
+        ResponseBean responseBean = iTaNewsService.addTaNews(taNews);
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/admin/taNews/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taNewsDelete(@PathVariable Integer id){
+        ResponseBean responseBean = iTaNewsService.deleteTaNews(id);
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taNews 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taNews/{id}",method= RequestMethod.PUT)
+    public ResponseBean taNewsUpdate(@PathVariable Integer id,
+                                        @RequestBody TaNews taNews){
+        taNews.setNewsId(id);
+        ResponseBean responseBean = iTaNewsService.updateTaNews(taNews);
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/taNews/{id}",method= RequestMethod.GET)
+    public ResponseBean taNewsGet(@PathVariable Integer id){
+        ResponseBean responseBean = iTaNewsService.getTaNewsById(id);
+        return responseBean;
+    }
+
+    /**
+     * 微信 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/wx/taNews/{id}",method= RequestMethod.GET)
+    public ResponseBean wxTaNewsGet(@PathVariable Integer id){
+        ResponseBean responseBean = iTaNewsService.getWxTaNewsById(id);
+        return responseBean;
+    }
+
+    /**
+     * 微信 资讯阅读量+1
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/wx/taNews/pvNum/{id}", method = RequestMethod.PUT)
+    public ResponseBean wxTaPvNum(@PathVariable Integer id) {
+        ResponseBean responseBean = iTaNewsService.wxTaPvNum(id);
+        return responseBean;
+    }
+}

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

@@ -1,141 +1,141 @@
-package com.huiju.estateagents.service;
-
-import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.entity.TaBuilding;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 项目表 服务类
- * </p>
- *
- * @author jobob
- * @since 2019-05-10
- */
-public interface ITaBuildingService extends IService<TaBuilding> {
-
-    /**
-     * 楼盘列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code);
-
-    /**
-     * 楼盘详情
-     * @param id
-     * @return
-     */
-    ResponseBean buildingSelectId(String id);
-
-    /**
-     * 楼盘详情
-     * @param id
-     * @return
-     */
-    ResponseBean buildingAllSelectId(String id);
-
-
-    /**
-     * 修改楼盘
-     * @param parameter
-     * @return
-     */
-    ResponseBean buildingUpdate(String parameter);
-
-    /**
-     *
-     * @param
-     * @return
-     */
-    ResponseBean appointmentList(Integer pageNum, Integer pageSize,String buildingId,String username,String phone,String status);
-
-    /**
-     * 添加楼盘
-     * @param parameter
-     * @return
-     */
-    ResponseBean buildingAdd(String parameter);
-
-    /**
-     * 修改成已发布
-     * @return
-     */
-    ResponseBean buildingUpdateStatus(String parameter);
-
-    /**
-     * 楼盘删除
-     * @return
-     */
-    ResponseBean buildingdelete(String id);
-
-
-    /**
-     * 楼盘户型添加
-     * @param parameter
-     * @return
-     */
-    ResponseBean buildingApartmentAdd(String parameter);
-
-    /**
-     * 户型添加
-     * @param parameter
-     * @return
-     */
-    ResponseBean buildingApartmentUpdate(String parameter);
-
-    /**
-     * 户型详情
-     * @param id
-     * @return
-     */
-    ResponseBean buildingApartmentSelectId(String id);
-
-    /**
-     * 修改核销备注
-     * @return
-     */
-    ResponseBean appointmentUpdate(String id,String writeoffRemark);
-
-    /**
-     * 微信小程序 楼盘列表
-     * @return
-     * @param pageNum
-     * @param pageSize
-     * @param name
-     */
-    ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets,Integer cityId);
-
-    /**
-     * 微信小程序 楼盘列表
-     * @return
-     */
-    ResponseBean getWxMainBuildingList();
-
-    ResponseBean getWxBuildingById(String buildingId);
-
-    /**
-     * 户型列表根据楼盘ID查询
-     * @param id
-     * @return
-     */
-    ResponseBean buildingApartmentBuildingId(String id);
-
-    /**
-     * 户型删除
-     * @param id
-     * @return
-     */
-    ResponseBean apartmentDel(String id);
-
-    /**
-     * 查询所有项目
-     * @return
-     */
-    ResponseBean buildingAll();
-
-    Integer getCityById(String buildingId);
-}
+package com.huiju.estateagents.service;
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaBuilding;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 项目表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+public interface ITaBuildingService extends IService<TaBuilding> {
+
+    /**
+     * 楼盘列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code);
+
+    /**
+     * 楼盘详情
+     * @param id
+     * @return
+     */
+    ResponseBean buildingSelectId(String id);
+
+    /**
+     * 楼盘详情
+     * @param id
+     * @return
+     */
+    ResponseBean buildingAllSelectId(String id);
+
+
+    /**
+     * 修改楼盘
+     * @param parameter
+     * @return
+     */
+    ResponseBean buildingUpdate(String parameter);
+
+    /**
+     *
+     * @param
+     * @return
+     */
+    ResponseBean appointmentList(Integer pageNum, Integer pageSize,String buildingId,String username,String phone,String status);
+
+    /**
+     * 添加楼盘
+     * @param parameter
+     * @return
+     */
+    ResponseBean buildingAdd(String parameter);
+
+    /**
+     * 修改成已发布
+     * @return
+     */
+    ResponseBean buildingUpdateStatus(String parameter);
+
+    /**
+     * 楼盘删除
+     * @return
+     */
+    ResponseBean buildingdelete(String id);
+
+
+    /**
+     * 楼盘户型添加
+     * @param parameter
+     * @return
+     */
+    ResponseBean buildingApartmentAdd(String parameter);
+
+    /**
+     * 户型添加
+     * @param parameter
+     * @return
+     */
+    ResponseBean buildingApartmentUpdate(String parameter);
+
+    /**
+     * 户型详情
+     * @param id
+     * @return
+     */
+    ResponseBean buildingApartmentSelectId(String id);
+
+    /**
+     * 修改核销备注
+     * @return
+     */
+    ResponseBean appointmentUpdate(String id,String writeoffRemark);
+
+    /**
+     * 微信小程序 楼盘列表
+     * @return
+     * @param pageNum
+     * @param pageSize
+     * @param name
+     */
+    ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets,Integer cityId,boolean mine);
+
+    /**
+     * 微信小程序 楼盘列表
+     * @return
+     */
+    ResponseBean getWxMainBuildingList();
+
+    ResponseBean getWxBuildingById(String buildingId);
+
+    /**
+     * 户型列表根据楼盘ID查询
+     * @param id
+     * @return
+     */
+    ResponseBean buildingApartmentBuildingId(String id);
+
+    /**
+     * 户型删除
+     * @param id
+     * @return
+     */
+    ResponseBean apartmentDel(String id);
+
+    /**
+     * 查询所有项目
+     * @return
+     */
+    ResponseBean buildingAll();
+
+    Integer getCityById(String buildingId);
+}

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

@@ -1,74 +1,74 @@
-package com.huiju.estateagents.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.entity.TaNews;
-
-import java.util.List;
-
-/**
- * <p>
- * 资讯表  服务类
- * </p>
- *
- * @author jobob
- * @since 2019-07-25
- */
-public interface ITaNewsService extends IService<TaNews> {
-
-    /**
-     * 查询资讯列表
-     * @param pageNum
-     * @param pageSize
-     * @param buildingId
-     * @param orgId
-     * @param newsTypeId
-     * @return
-     */
-    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus);
-
-    /**
-     * 根据Id查询资讯数据
-     * @param newsId
-     * @return
-     */
-    ResponseBean getTaNewsById(Integer newsId);
-
-    /**
-     * 修改资讯数据
-     * @param taNews
-     * @return
-     */
-    ResponseBean updateTaNews(TaNews taNews);
-
-    /**
-     * add资讯数据
-     * @param taNews
-     * @return
-     */
-    ResponseBean addTaNews(TaNews taNews);
-
-    /**
-     * 删除资讯
-     * @param newsId
-     * @return
-     */
-    ResponseBean deleteTaNews(Integer newsId);
-
-    /**
-     * 微信 根据Id查询资讯数据
-     * @param newsId
-     * @return
-     */
-    ResponseBean getWxTaNewsById(Integer newsId);
-
-    /**
-     * 微信 阅读量 +1
-     * @param id
-     * @return
-     */
-    ResponseBean wxTaPvNum(Integer id);
-
-    IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,Integer cityId);
-}
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaNews;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资讯表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+public interface ITaNewsService extends IService<TaNews> {
+
+    /**
+     * 查询资讯列表
+     * @param pageNum
+     * @param pageSize
+     * @param buildingId
+     * @param orgId
+     * @param newsTypeId
+     * @return
+     */
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus);
+
+    /**
+     * 根据Id查询资讯数据
+     * @param newsId
+     * @return
+     */
+    ResponseBean getTaNewsById(Integer newsId);
+
+    /**
+     * 修改资讯数据
+     * @param taNews
+     * @return
+     */
+    ResponseBean updateTaNews(TaNews taNews);
+
+    /**
+     * add资讯数据
+     * @param taNews
+     * @return
+     */
+    ResponseBean addTaNews(TaNews taNews);
+
+    /**
+     * 删除资讯
+     * @param newsId
+     * @return
+     */
+    ResponseBean deleteTaNews(Integer newsId);
+
+    /**
+     * 微信 根据Id查询资讯数据
+     * @param newsId
+     * @return
+     */
+    ResponseBean getWxTaNewsById(Integer newsId);
+
+    /**
+     * 微信 阅读量 +1
+     * @param id
+     * @return
+     */
+    ResponseBean wxTaPvNum(Integer id);
+
+    IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,Integer cityId,boolean mine);
+}

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

@@ -1,200 +1,204 @@
-package com.huiju.estateagents.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.common.BeanTools;
-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.exception.EstaException;
-import com.huiju.estateagents.mapper.TaFavorMapper;
-import com.huiju.estateagents.mapper.TaNewsMapper;
-import com.huiju.estateagents.service.ITaBuildingService;
-import com.huiju.estateagents.service.ITaNewsService;
-import com.huiju.estateagents.service.ITaNewsTypeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * <p>
- * 资讯表  服务实现类
- * </p>
- *
- * @author jobob
- * @since 2019-07-25
- */
-@Service
-public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> implements ITaNewsService {
-
-    @Autowired
-    private ITaNewsTypeService iTaNewsTypeService;
-
-    @Autowired
-    private ITaBuildingService iTaBuildingService;
-
-    @Autowired
-    private TaFavorMapper taFavorMapper;
-
-    @Autowired
-    private TaNewsMapper taNewsMapper;
-
-
-    @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus) {
-        ResponseBean responseBean = new ResponseBean();
-
-        IPage<TaNews> page = new Page<>();
-        page.setCurrent(pageNum);
-        page.setSize(pageSize);
-
-        QueryWrapper<TaNews> taNewsQueryWrapper = new QueryWrapper<>();
-        taNewsQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id", buildingId);
-        taNewsQueryWrapper.eq(orgId != null,"org_id", orgId);
-        taNewsQueryWrapper.eq(newsTypeId != null,"news_type_id", newsTypeId);
-        taNewsQueryWrapper.eq(newsStatus != null, "news_status", newsStatus);
-        taNewsQueryWrapper.eq("status", 1);
-        taNewsQueryWrapper.orderByDesc("create_date");
-        IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
-
-        injectType(taNewsIPage.getRecords());
-
-        responseBean.addSuccess(taNewsIPage);
-        return responseBean;
-    }
-
-    private void injectType(List<TaNews> records) {
-        records.forEach(e -> {
-            TaNewsType newsType = iTaNewsTypeService.getById(e.getNewsTypeId());
-            e.setNewsType(newsType);
-        });
-    }
-
-    @Override
-    public ResponseBean getTaNewsById(Integer newsId) {
-        ResponseBean responseBean = new ResponseBean();
-        if (null == newsId) {
-            responseBean.addError("编号不能为空！");
-        }
-        responseBean.addSuccess(this.getById(newsId));
-        return  responseBean;
-    }
-
-    @Override
-    public ResponseBean updateTaNews(TaNews taNews) {
-        ResponseBean responseBean = new ResponseBean();
-        TaNews oldNews = this.getById(taNews.getNewsId());
-        if (null == oldNews) {
-            responseBean.addError("资讯不存在！");
-            return responseBean;
-        }
-
-        //-- 校验 公司，楼盘，资讯类型
-        check(taNews);
-
-        BeanTools.copyProperties(taNews, oldNews);
-        this.updateById(oldNews);
-        responseBean.addSuccess(oldNews);
-        return responseBean;
-    }
-
-    @Override
-    public ResponseBean addTaNews(TaNews taNews) {
-        ResponseBean responseBean = new ResponseBean();
-        check(taNews);
-
-        taNews.setCreateDate(LocalDateTime.now());
-        taNews.setStatus(1);
-        this.save(taNews);
-        responseBean.addSuccess(taNews);
-        return responseBean;
-    }
-
-    private void check(TaNews taNews) {
-        //-- 校验 公司，楼盘，资讯类型
-        // TODO 公司校验没有写 taNews.getOrgId()
-
-        TaBuilding taBuilding = iTaBuildingService.getById(taNews.getBuildingId());
-        if (null == taBuilding) {
-            throw new EstaException("楼盘不存在！");
-        }
-        TaNewsType taNewsType = iTaNewsTypeService.getById(taNews.getNewsTypeId());
-        if (null == taNewsType) {
-            throw new EstaException("资讯类型不存在！");
-        }
-    }
-
-    @Override
-    public ResponseBean deleteTaNews(Integer newsId) {
-        ResponseBean responseBean = getTaNewsById(newsId);
-        if (1 == responseBean.getCode()) {
-            return responseBean;
-        }
-        TaNews taNews = (TaNews) responseBean.getData();
-        if (null == taNews) {
-            responseBean.addError("数据不存!");
-        }
-
-        // 修改状态
-        taNews.setStatus(0);
-        this.updateById(taNews);
-
-        responseBean.addSuccess(taNews);
-        return responseBean;
-    }
-
-    @Override
-    public ResponseBean getWxTaNewsById(Integer newsId) {
-        ResponseBean responseBean = getTaNewsById(newsId);
-        if (1 == responseBean.getCode()) {
-            return responseBean;
-        }
-        TaNews taNews = (TaNews) responseBean.getData();
-        if (null == taNews) {
-            responseBean.addError("数据不存!");
-        }
-
-        responseBean.addSuccess(taNews);
-        return responseBean;
-    }
-
-    @Override
-    public ResponseBean wxTaPvNum(Integer id) {
-        ResponseBean responseBean = getTaNewsById(id);
-        if (1 == responseBean.getCode()) {
-            return responseBean;
-        }
-        TaNews taNews = (TaNews) responseBean.getData();
-        if (null == taNews) {
-            responseBean.addError("数据不存!");
-        }
-
-        taNewsMapper.setFieldNum(String.valueOf(id), "pv_num", 1);
-
-        responseBean.addSuccess((Object)"");
-        return responseBean;
-    }
-
-    @Override
-    public IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,Integer 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(null != cityId && cityId != 0,"city_id",cityId);
-        taNewsQueryWrapper.eq("status", 1);
-        taNewsQueryWrapper.orderByDesc("create_date");
-        IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
-
-        injectType(taNewsIPage.getRecords());
-
-        return page;
-    }
-}
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.BeanTools;
+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.exception.EstaException;
+import com.huiju.estateagents.mapper.TaFavorMapper;
+import com.huiju.estateagents.mapper.TaNewsMapper;
+import com.huiju.estateagents.service.ITaBuildingService;
+import com.huiju.estateagents.service.ITaNewsService;
+import com.huiju.estateagents.service.ITaNewsTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 资讯表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@Service
+public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> implements ITaNewsService {
+
+    @Autowired
+    private ITaNewsTypeService iTaNewsTypeService;
+
+    @Autowired
+    private ITaBuildingService iTaBuildingService;
+
+    @Autowired
+    private TaFavorMapper taFavorMapper;
+
+    @Autowired
+    private TaNewsMapper taNewsMapper;
+
+
+    @Override
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus) {
+        ResponseBean responseBean = new ResponseBean();
+
+        IPage<TaNews> page = new Page<>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+
+        QueryWrapper<TaNews> taNewsQueryWrapper = new QueryWrapper<>();
+        taNewsQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id", buildingId);
+        taNewsQueryWrapper.eq(orgId != null,"org_id", orgId);
+        taNewsQueryWrapper.eq(newsTypeId != null,"news_type_id", newsTypeId);
+        taNewsQueryWrapper.eq(newsStatus != null, "news_status", newsStatus);
+        taNewsQueryWrapper.eq("status", 1);
+        taNewsQueryWrapper.orderByDesc("create_date");
+        IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
+
+        injectType(taNewsIPage.getRecords());
+
+        responseBean.addSuccess(taNewsIPage);
+        return responseBean;
+    }
+
+    private void injectType(List<TaNews> records) {
+        records.forEach(e -> {
+            TaNewsType newsType = iTaNewsTypeService.getById(e.getNewsTypeId());
+            e.setNewsType(newsType);
+        });
+    }
+
+    @Override
+    public ResponseBean getTaNewsById(Integer newsId) {
+        ResponseBean responseBean = new ResponseBean();
+        if (null == newsId) {
+            responseBean.addError("编号不能为空！");
+        }
+        responseBean.addSuccess(this.getById(newsId));
+        return  responseBean;
+    }
+
+    @Override
+    public ResponseBean updateTaNews(TaNews taNews) {
+        ResponseBean responseBean = new ResponseBean();
+        TaNews oldNews = this.getById(taNews.getNewsId());
+        if (null == oldNews) {
+            responseBean.addError("资讯不存在！");
+            return responseBean;
+        }
+
+        //-- 校验 公司，楼盘，资讯类型
+        check(taNews);
+
+        BeanTools.copyProperties(taNews, oldNews);
+        this.updateById(oldNews);
+        responseBean.addSuccess(oldNews);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean addTaNews(TaNews taNews) {
+        ResponseBean responseBean = new ResponseBean();
+        check(taNews);
+
+        taNews.setCreateDate(LocalDateTime.now());
+        taNews.setStatus(1);
+        this.save(taNews);
+        responseBean.addSuccess(taNews);
+        return responseBean;
+    }
+
+    private void check(TaNews taNews) {
+        //-- 校验 公司，楼盘，资讯类型
+        // TODO 公司校验没有写 taNews.getOrgId()
+
+        TaBuilding taBuilding = iTaBuildingService.getById(taNews.getBuildingId());
+        if (null == taBuilding) {
+            throw new EstaException("楼盘不存在！");
+        }
+        TaNewsType taNewsType = iTaNewsTypeService.getById(taNews.getNewsTypeId());
+        if (null == taNewsType) {
+            throw new EstaException("资讯类型不存在！");
+        }
+    }
+
+    @Override
+    public ResponseBean deleteTaNews(Integer newsId) {
+        ResponseBean responseBean = getTaNewsById(newsId);
+        if (1 == responseBean.getCode()) {
+            return responseBean;
+        }
+        TaNews taNews = (TaNews) responseBean.getData();
+        if (null == taNews) {
+            responseBean.addError("数据不存!");
+        }
+
+        // 修改状态
+        taNews.setStatus(0);
+        this.updateById(taNews);
+
+        responseBean.addSuccess(taNews);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean getWxTaNewsById(Integer newsId) {
+        ResponseBean responseBean = getTaNewsById(newsId);
+        if (1 == responseBean.getCode()) {
+            return responseBean;
+        }
+        TaNews taNews = (TaNews) responseBean.getData();
+        if (null == taNews) {
+            responseBean.addError("数据不存!");
+        }
+
+        responseBean.addSuccess(taNews);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean wxTaPvNum(Integer id) {
+        ResponseBean responseBean = getTaNewsById(id);
+        if (1 == responseBean.getCode()) {
+            return responseBean;
+        }
+        TaNews taNews = (TaNews) responseBean.getData();
+        if (null == taNews) {
+            responseBean.addError("数据不存!");
+        }
+
+        taNewsMapper.setFieldNum(String.valueOf(id), "pv_num", 1);
+
+        responseBean.addSuccess((Object)"");
+        return responseBean;
+    }
+
+    @Override
+    public IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,Integer cityId,boolean mine) {
+        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(null != cityId && cityId != 0,"city_id",cityId);
+        taNewsQueryWrapper.eq("status", 1);
+        taNewsQueryWrapper.orderByDesc("create_date");
+        IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
+
+        injectType(taNewsIPage.getRecords());
+        if (targets.size()<=0 && mine){
+            return null;
+        }else {
+            return page;
+        }
+
+    }
+}

src/main/resources/mapper/TaBuildingDynamicMapper.xml

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