Browse Source

移动端获取新闻详情接口修改

dev
yujintao 6 years ago
parent
commit
933777c1e3
  1. 12
      esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
  2. 15
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java
  3. 25
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java
  4. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java
  5. 20
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java
  6. 7
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java
  7. 25
      esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsDetailFormDTO.java
  8. 32
      esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNewsDetailResultDTO.java
  9. 15
      esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNewsListResultDTO.java
  10. 12
      esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNewsController.java
  11. 28
      esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsDao.java
  12. 26
      esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsService.java
  13. 7
      esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java
  14. 48
      esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml

12
esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml

@ -126,8 +126,8 @@
<nacos.register-enabled>false</nacos.register-enabled>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<wx.mp.configs.appId>wx6ff4e50840cf7dfc</wx.mp.configs.appId>
<wx.mp.configs.secret>caf82e454ae4e2cb9697651194c37784</wx.mp.configs.secret>
<wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
<wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>
<wx.mp.configs.token>111</wx.mp.configs.token>
<wx.mp.configs.aesKey>111</wx.mp.configs.aesKey>
</properties>
@ -154,8 +154,8 @@
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<wx.mp.configs.appId>wx6ff4e50840cf7dfc</wx.mp.configs.appId>
<wx.mp.configs.secret>caf82e454ae4e2cb9697651194c37784</wx.mp.configs.secret>
<wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
<wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>
<wx.mp.configs.token>111</wx.mp.configs.token>
<wx.mp.configs.aesKey>111</wx.mp.configs.aesKey>
</properties>
@ -182,8 +182,8 @@
<nacos.register-enabled>false</nacos.register-enabled>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<wx.mp.configs.appId>wx62aba559696345af</wx.mp.configs.appId>
<wx.mp.configs.secret>a93c3dd28ce34fb96228830141e51549</wx.mp.configs.secret>
<wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
<wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>
<wx.mp.configs.token>111</wx.mp.configs.token>
<wx.mp.configs.aesKey>111</wx.mp.configs.aesKey>
</properties>

15
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java

@ -91,8 +91,8 @@ public class ApiNewsController {
*
*/
@GetMapping("news/detail/{newsId}")
public Result<EpdcNewsDetailResultDTO> getNewsDetail(@PathVariable("newsId") String id) {
Result<EpdcNewsDetailResultDTO> newsDetail = newsService.getNewsDetail(id);
public Result<EpdcNewsDetailResultDTO> getNewsDetail(@PathVariable("newsId") String id, @LoginUser TokenDto userDetail) {
Result<EpdcNewsDetailResultDTO> newsDetail = newsService.getNewsDetail(id, userDetail.getUserId());
return newsDetail;
}
@ -149,24 +149,25 @@ public class ApiNewsController {
* @date 2019/9/10 17:05
*/
@GetMapping("information/listByUserId")
public Result<List<EpdcInformationListResultDTO>> listInformationByUserId(@LoginUser TokenDto userDetail,EpdcInformationListFormDTO formDto) {
public Result<List<EpdcInformationListResultDTO>> listInformationByUserId(@LoginUser TokenDto userDetail, EpdcInformationListFormDTO formDto) {
return newsService.listInformationByUserId(userDetail, formDto);
}
/***
* banner 列表
* @param userDetail
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcInformationListResultDTO>>
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcInformationListResultDTO>>
* @author qushutong
* @date 2019/9/11 9:21
*/
@GetMapping("banner/list")
public Result<List<EpdcBannerListResultDTO>> listBanner(EpdcBannerListFromDTO fromDTO,@LoginUser TokenDto userDetail) {
return newsService.listBanner(fromDTO,userDetail);
public Result<List<EpdcBannerListResultDTO>> listBanner(EpdcBannerListFromDTO fromDTO, @LoginUser TokenDto userDetail) {
return newsService.listBanner(fromDTO, userDetail);
}
@PostMapping("information/first")
public Result<EpdcIFristInfoResultDTO> selectOneFristByUserId(@LoginUser TokenDto userDetail){
public Result<EpdcIFristInfoResultDTO> selectOneFristByUserId(@LoginUser TokenDto userDetail) {
return newsService.selectOneFristByUserId(userDetail);
}
}

25
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java

@ -26,7 +26,7 @@ public interface NewsFeignClient {
* 获取通知列表
*
* @param formDto
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO>>
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO>>
* @author yujintao
* @date 2019/9/5 20:07
*/
@ -61,24 +61,23 @@ public interface NewsFeignClient {
* @Author qushutong
* @Date 2019/9/9 9:17
* @Param [formDto]
* @Return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO>>
* @Return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO>>
* @Exception
*
*/
@GetMapping(value = "news/epdc-app/news/listNews", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<List<EpdcNewsListResultDTO>> listNews(@RequestBody EpdcNewsListFromDTO formDto);
/***
* @Description 获取详情
* @Author qushutong
* @Date 2019/9/9 10:20
* @Param id
* @Return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO>
* @Exception
/**
* 移动端获取新闻详情
*
* @param formDto
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO>
* @author yujintao
* @date 2019/9/12 10:46
*/
@GetMapping("news/epdc-app/news/detail/{newsId}")
Result<EpdcNewsDetailResultDTO> getNewsDetail(@PathVariable("newsId") String id);
@GetMapping(value = "news/epdc-app/news/detail", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<EpdcNewsDetailResultDTO> getNewsDetail(EpdcNewsDetailFormDTO formDto);
/***
* @Description 点赞和踩
@ -130,7 +129,7 @@ public interface NewsFeignClient {
* 移动端用户消息列表
*
* @param formDto
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcInformationListResultDTO>>
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcInformationListResultDTO>>
* @author yujintao
* @date 2019/9/10 17:09
*/
@ -140,7 +139,7 @@ public interface NewsFeignClient {
/***
* 移动端banner列表
* @param fromDTO
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO>>
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO>>
* @author qushutong
* @date 2019/9/11 9:25
*/

4
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java

@ -40,8 +40,8 @@ public class NewsFeignClientFallback implements NewsFeignClient {
}
@Override
public Result<EpdcNewsDetailResultDTO> getNewsDetail(String id) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "getNewsDetail", id);
public Result<EpdcNewsDetailResultDTO> getNewsDetail(EpdcNewsDetailFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "getNewsDetail", formDto);
}
@Override

20
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java

@ -59,16 +59,16 @@ public interface NewsService {
*/
Result<List<EpdcNewsListResultDTO>> listNews(TokenDto userDetail, EpdcNewsListFromDTO formDto);
/***
* @Description 获取新闻详情
* @Author qushutong
* @Date 2019/9/9 10:16
* @Param [id]
* @Return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO>
* @Exception
/**
* 移动端获取新闻详情
*
* @param newsId 新闻ID
* @param userId 用户ID
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO>
* @author yujintao
* @date 2019/9/12 10:45
*/
Result<EpdcNewsDetailResultDTO> getNewsDetail(String id);
Result<EpdcNewsDetailResultDTO> getNewsDetail(String newsId, String userId);
/***
* @Description 点赞踩
@ -117,11 +117,11 @@ public interface NewsService {
/***
* 移动端 banner列表
* @param userDetail
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO>>
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO>>
* @author qushutong
* @date 2019/9/11 9:22
*/
Result<List<EpdcBannerListResultDTO>> listBanner(EpdcBannerListFromDTO fromDTO,TokenDto userDetail);
Result<List<EpdcBannerListResultDTO>> listBanner(EpdcBannerListFromDTO fromDTO, TokenDto userDetail);
/***

7
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java

@ -48,8 +48,11 @@ public class NewsServiceImpl implements NewsService {
}
@Override
public Result<EpdcNewsDetailResultDTO> getNewsDetail(String id) {
return newsFeignClient.getNewsDetail(id);
public Result<EpdcNewsDetailResultDTO> getNewsDetail(String newsId, String userId) {
EpdcNewsDetailFormDTO form = new EpdcNewsDetailFormDTO();
form.setNewsId(newsId);
form.setUserId(userId);
return newsFeignClient.getNewsDetail(form);
}
@Override

25
esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsDetailFormDTO.java

@ -0,0 +1,25 @@
package com.elink.esua.epdc.dto.epdc.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 新闻详情
*
* @author yujintao
* @email yujintao@elink-cn.com
* @date 2019/9/12 10:37
*/
@Data
public class EpdcNewsDetailFormDTO implements Serializable {
private static final long serialVersionUID = -1361194389875631869L;
@NotBlank(message = "新闻ID不能为空")
private String newsId;
@NotBlank(message = "用户ID不能为空")
private String userId;
}

32
esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNewsDetailResultDTO.java

@ -6,9 +6,9 @@ import java.io.Serializable;
/**
* @author: qushutong
* @Date: 2019/9/7 13:32
* @Description: 新闻详情
* @author: qushutong
* @Date: 2019/9/7 13:32
* @Description: 新闻详情
*/
@Data
public class EpdcNewsDetailResultDTO implements Serializable {
@ -16,26 +16,22 @@ public class EpdcNewsDetailResultDTO implements Serializable {
private static final long serialVersionUID = 6765985767338100673L;
/**
* id : 82169
* newsTitle : d5bHhnWrMb
* newsStartTime : 1567831577224
* deptName : tKwzmvt6AQ
* newsContent : OYkfhRndiA
* readingAmount : 61372
* unlikeNumber : 64579
* likeNumber : 75873
* categoryName : p2PEfoKEQD
*/
private String id;
private String newsTitle;
private String newsStartTime;
private String deptName;
private String newsContent;
private int readingAmount;
private int unlikeNumber;
private int likeNumber;
private Integer readingAmount;
private Integer unlikeNumber;
private Integer likeNumber;
private String categoryName;
/**
* 用户是否已点赞 0否1是
*/
private String likeFlag;
/**
* 用户是否已踩 0否1是
*/
private String unLikeFlag;
}

15
esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNewsListResultDTO.java

@ -6,22 +6,14 @@ import java.io.Serializable;
/**
* @author: qushutong
* @Date: 2019/9/7 11:22
* @Description: 用于移动端 新闻列表
* @author: qushutong
* @Date: 2019/9/7 11:22
* @Description: 用于移动端 新闻列表
*/
@Data
public class EpdcNewsListResultDTO implements Serializable {
private static final long serialVersionUID = -7339344639815196599L;
/**
* id : 64169
* newsTitle : EZzAN7yh9R
* newsStartTime : 1567680303200
* deptName : dcgGCA2jmS
* newsCategoryName : ceBk9KBJoy
* newsImageUrl : http://wda.mwtdqdkwqrclpb.cnaqd
*/
private String id;
private String newsTitle;
@ -29,5 +21,4 @@ public class EpdcNewsListResultDTO implements Serializable {
private String deptName;
private String newsCategoryName;
private String newsImageUrl;
}

12
esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNewsController.java

@ -21,10 +21,7 @@ import com.elink.esua.epdc.commons.tools.constant.Constant;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.dto.BannerDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcBannerListFromDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcNewsBrowseFromDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcNewsListFromDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcNewsStatementFromDTO;
import com.elink.esua.epdc.dto.epdc.form.*;
import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
@ -78,10 +75,9 @@ public class EpdcAppNewsController {
* @Exception
*
*/
@GetMapping("detail/{newsId}")
public Result<EpdcNewsDetailResultDTO> getNewsDetail(@PathVariable("newsId") String id) {
Result<EpdcNewsDetailResultDTO> newsDetail = newsService.getNewsDetail(id);
return newsDetail;
@GetMapping("detail")
public Result<EpdcNewsDetailResultDTO> getNewsDetail(@RequestBody EpdcNewsDetailFormDTO formDto) {
return newsService.getNewsDetail(formDto);
}
/***

28
esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsDao.java

@ -18,6 +18,7 @@
package com.elink.esua.epdc.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.dto.epdc.form.EpdcNewsDetailFormDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcNewsListFromDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
@ -36,25 +37,26 @@ import java.util.List;
public interface NewsDao extends BaseDao<NewsEntity> {
int selectCountByCategoryId(String categoryId);
/***
* @Description 新闻列表api
* @Author qushutong
* @Date 2019/9/7 12:13
* @Param [formDto]
* @Return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO>
* @Description 新闻列表api
* @Author qushutong
* @Date 2019/9/7 12:13
* @Param [formDto]
* @Return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO>
* @Exception
*
*/
List<EpdcNewsListResultDTO> selectListAppNews(EpdcNewsListFromDTO formDto);
/***
* @Description 获取新闻详情
* @Author qushutong
* @Date 2019/9/7 14:25
* @Param [id]
* @Return com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO
* @Exception
/**
* 移动端获取新闻详情
*
* @param formDto
* @return com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO
* @author yujintao
* @date 2019/9/12 10:41
*/
EpdcNewsDetailResultDTO selectOneAppNewsDetailById(String id);
EpdcNewsDetailResultDTO selectOneAppNewsDetail(EpdcNewsDetailFormDTO formDto);
}

26
esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsService.java

@ -22,6 +22,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.NewsDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcNewsBrowseFromDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcNewsDetailFormDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcNewsListFromDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcNewsStatementFromDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO;
@ -136,16 +137,15 @@ public interface NewsService extends BaseService<NewsEntity> {
*/
Result<List<EpdcNewsListResultDTO>> listNews(EpdcNewsListFromDTO formDto);
/***
* @Description 获取新闻详情
* @Author qushutong
* @Date 2019/9/7 13:35
* @Param [newsId]
* @Return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO>
* @Exception
/**
* 获取新闻详情
*
* @param formDto
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO>
* @author yujintao
* @date 2019/9/12 10:40
*/
Result<EpdcNewsDetailResultDTO> getNewsDetail(String newsId);
Result<EpdcNewsDetailResultDTO> getNewsDetail(EpdcNewsDetailFormDTO formDto);
/***
* @Description 新闻点赞或踩
@ -159,11 +159,11 @@ public interface NewsService extends BaseService<NewsEntity> {
Result modifyStatement(EpdcNewsStatementFromDTO newsStatementFromDTO);
/***
* @Description 新闻浏览
* @Author qushutong
* @Date 2019/9/7 14:44
* @Param [newsBrowseFromDTO]
* @Return com.elink.esua.epdc.commons.tools.utils.Result
* @Description 新闻浏览
* @Author qushutong
* @Date 2019/9/7 14:44
* @Param [newsBrowseFromDTO]
* @Return com.elink.esua.epdc.commons.tools.utils.Result
* @Exception
*
*/

7
esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java

@ -33,6 +33,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dao.NewsDao;
import com.elink.esua.epdc.dto.NewsDTO;
import com.elink.esua.epdc.dto.NewsUserAttitudeDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcNewsDetailFormDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
import com.elink.esua.epdc.entity.NewsUserAttitudeEntity;
import com.elink.esua.epdc.enums.AppNewsLikeEnum;
@ -267,9 +268,9 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
}
@Override
public Result<EpdcNewsDetailResultDTO> getNewsDetail(String newsId) {
EpdcNewsDetailResultDTO epdcNewsDetailResultDTO = baseDao.selectOneAppNewsDetailById(newsId);
return new Result<EpdcNewsDetailResultDTO>().ok(epdcNewsDetailResultDTO);
public Result<EpdcNewsDetailResultDTO> getNewsDetail(EpdcNewsDetailFormDTO formDto) {
EpdcNewsDetailResultDTO epdcNewsDetailResultDTO = baseDao.selectOneAppNewsDetail(formDto);
return new Result().ok(epdcNewsDetailResultDTO);
}
@Override

48
esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml

@ -3,36 +3,6 @@
<mapper namespace="com.elink.esua.epdc.dao.NewsDao">
<resultMap type="com.elink.esua.epdc.entity.NewsEntity" id="newsMap">
<result property="id" column="ID"/>
<result property="newsTitle" column="NEWS_TITLE"/>
<result property="newsContent" column="NEWS_CONTENT"/>
<result property="newsCateroryId" column="NEWS_CATERORY_ID"/>
<result property="newsProperty" column="NEWS_PROPERTY"/>
<result property="newsImageUrl" column="NEWS_IMAGE_URL"/>
<result property="newsUpDownState" column="NEWS_UP_DOWN_STATE"/>
<result property="newsReleaseStartTime" column="NEWS_RELEASE_START_TIME"/>
<result property="newsReleaseEndTime" column="NEWS_RELEASE_END_TIME"/>
<result property="deptName" column="DEPT_NAME"/>
<result property="deptId" column="DEPT_ID"/>
<result property="readingAmount" column="READING_AMOUNT"/>
<result property="likeNumber" column="LIKE_NUMBER"/>
<result property="unLikeNumber" column="UN_LIKE_NUMBER"/>
<result property="delFlag" column="DEL_FLAG"/>
<result property="revision" column="REVISION"/>
<result property="createdBy" column="CREATED_BY"/>
<result property="createdTime" column="CREATED_TIME"/>
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
<result property="street" column="STREET"/>
<result property="streetId" column="STREET_ID"/>
<result property="community" column="COMMUNITY"/>
<result property="communityId" column="COMMUNITY_ID"/>
<result property="grid" column="GRID"/>
<result property="gridId" column="GRID_ID"/>
<result property="creatorName" column="CREATOR_NAME"/>
<result property="newsReleaseState" column="NEWS_RELEASE_STATE"/>
</resultMap>
<select id="selectCountByCategoryId" resultType="int">
SELECT
COUNT(*) AS count
@ -41,6 +11,7 @@
WHERE
NEWS_CATERORY_ID = #{categoryId}
</select>
<select id="selectListAppNews" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO">
SELECT
en.ID AS id,
@ -67,24 +38,27 @@
en.NEWS_RELEASE_START_TIME DESC
LIMIT #{pageIndex},#{pageSize}
</select>
<select id="selectOneAppNewsDetailById" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO">
<select id="selectOneAppNewsDetail"
resultType="com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO">
SELECT
en.ID AS id,
en.NEWS_TITLE AS newsTitle,
en.NEWS_RELEASE_START_TIME AS newsStartTime,
IFNULL(
IFNULL(en.GRID, en.COMMUNITY),
en.STREET
) AS deptName,
IFNULL( IFNULL(en.GRID, en.COMMUNITY), en.STREET ) AS deptName,
en.NEWS_CONTENT AS newsContent,
en.READING_AMOUNT AS readingAmount,
en.UN_LIKE_NUMBER AS unlikeNumber,
en.LIKE_NUMBER AS likeNumber,
nc.CATEGORY_NAME AS categoryName
nc.CATEGORY_NAME AS categoryName,
CASE nu.ATTITUDE_FLAG WHEN '0' THEN '1' ELSE '0' END AS likeFlag,
CASE nu.ATTITUDE_FLAG WHEN '1' THEN '1' ELSE '0' END AS unLikeFlag
FROM
epdc_news en
LEFT JOIN epdc_news_category nc ON en.NEWS_CATERORY_ID = nc.ID
LEFT JOIN epdc_news_user_attitude nu on nu.EPDC_NEWS_ID = en.ID AND nu.USER_ID = #{userId} AND nu.DEL_FLAG = '0'
WHERE
en.ID = #{id}
en.ID = #{newsId}
</select>
</mapper>
Loading…
Cancel
Save