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

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

@@ -5,8 +5,14 @@ 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;
@@ -18,6 +24,9 @@ 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>
     * 资讯表  前端控制器
@@ -35,6 +44,12 @@ public class TaNewsController extends BaseController {
     @Autowired
     public ITaNewsService iTaNewsService;
 
+    @Autowired
+    public ITaPersonService iTaPersonService;
+
+    @Autowired
+    public ITaSaveService iTaSaveService;
+
 
     /**
      * 分页查询列表
@@ -61,9 +76,23 @@ public class TaNewsController extends BaseController {
      */
     @RequestMapping(value="/wx/taNews",method= RequestMethod.GET)
     public ResponseBean wxTaNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
-        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, null, null, null, null);
-        return responseBean;
+                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     @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, targets);
+        return ResponseBean.success(results);
     }
 
     /**

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaNews;
 
+import java.util.List;
+
 /**
  * <p>
  * 资讯表  服务类
@@ -67,4 +69,6 @@ public interface ITaNewsService extends IService<TaNews> {
      * @return
      */
     ResponseBean wxTaPvNum(Integer id);
+
+    IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, List<String> targets);
 }

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

@@ -69,14 +69,17 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         taNewsQueryWrapper.orderByDesc("create_date");
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
 
-        List<TaNews> records = taNewsIPage.getRecords();
+        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);
         });
-
-        responseBean.addSuccess(taNewsIPage);
-        return responseBean;
     }
 
     @Override
@@ -183,4 +186,19 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         responseBean.addSuccess((Object)"");
         return responseBean;
     }
+
+    @Override
+    public IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, List<String> targets) {
+        IPage<TaNews> page = new Page<>(pageNum, pageSize);
+
+        QueryWrapper<TaNews> taNewsQueryWrapper = new QueryWrapper<>();
+        taNewsQueryWrapper.in(null != targets && targets.size() > 0, "news_id", targets);
+        taNewsQueryWrapper.eq("status", 1);
+        taNewsQueryWrapper.orderByDesc("create_date");
+        IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
+
+        injectType(taNewsIPage.getRecords());
+
+        return page;
+    }
 }