Browse Source

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

dev
yujintao 6 years ago
parent
commit
933777c1e3
  1. 12
      esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
  2. 5
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java
  3. 17
      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. 16
      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. 26
      esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNewsDetailResultDTO.java
  9. 9
      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. 18
      esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsDao.java
  12. 16
      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.register-enabled>false</nacos.register-enabled>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr> <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<wx.mp.configs.appId>wx6ff4e50840cf7dfc</wx.mp.configs.appId> <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
<wx.mp.configs.secret>caf82e454ae4e2cb9697651194c37784</wx.mp.configs.secret> <wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>
<wx.mp.configs.token>111</wx.mp.configs.token> <wx.mp.configs.token>111</wx.mp.configs.token>
<wx.mp.configs.aesKey>111</wx.mp.configs.aesKey> <wx.mp.configs.aesKey>111</wx.mp.configs.aesKey>
</properties> </properties>
@ -154,8 +154,8 @@
<nacos.register-enabled>true</nacos.register-enabled> <nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr> <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<wx.mp.configs.appId>wx6ff4e50840cf7dfc</wx.mp.configs.appId> <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
<wx.mp.configs.secret>caf82e454ae4e2cb9697651194c37784</wx.mp.configs.secret> <wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>
<wx.mp.configs.token>111</wx.mp.configs.token> <wx.mp.configs.token>111</wx.mp.configs.token>
<wx.mp.configs.aesKey>111</wx.mp.configs.aesKey> <wx.mp.configs.aesKey>111</wx.mp.configs.aesKey>
</properties> </properties>
@ -182,8 +182,8 @@
<nacos.register-enabled>false</nacos.register-enabled> <nacos.register-enabled>false</nacos.register-enabled>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr> <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<wx.mp.configs.appId>wx62aba559696345af</wx.mp.configs.appId> <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
<wx.mp.configs.secret>a93c3dd28ce34fb96228830141e51549</wx.mp.configs.secret> <wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>
<wx.mp.configs.token>111</wx.mp.configs.token> <wx.mp.configs.token>111</wx.mp.configs.token>
<wx.mp.configs.aesKey>111</wx.mp.configs.aesKey> <wx.mp.configs.aesKey>111</wx.mp.configs.aesKey>
</properties> </properties>

5
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}") @GetMapping("news/detail/{newsId}")
public Result<EpdcNewsDetailResultDTO> getNewsDetail(@PathVariable("newsId") String id) { public Result<EpdcNewsDetailResultDTO> getNewsDetail(@PathVariable("newsId") String id, @LoginUser TokenDto userDetail) {
Result<EpdcNewsDetailResultDTO> newsDetail = newsService.getNewsDetail(id); Result<EpdcNewsDetailResultDTO> newsDetail = newsService.getNewsDetail(id, userDetail.getUserId());
return newsDetail; return newsDetail;
} }
@ -152,6 +152,7 @@ public class ApiNewsController {
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); return newsService.listInformationByUserId(userDetail, formDto);
} }
/*** /***
* banner 列表 * banner 列表
* @param userDetail * @param userDetail

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

@ -68,17 +68,16 @@ public interface NewsFeignClient {
@GetMapping(value = "news/epdc-app/news/listNews", consumes = MediaType.APPLICATION_JSON_VALUE) @GetMapping(value = "news/epdc-app/news/listNews", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<List<EpdcNewsListResultDTO>> listNews(@RequestBody EpdcNewsListFromDTO formDto); 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}") @GetMapping(value = "news/epdc-app/news/detail", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<EpdcNewsDetailResultDTO> getNewsDetail(@PathVariable("newsId") String id); Result<EpdcNewsDetailResultDTO> getNewsDetail(EpdcNewsDetailFormDTO formDto);
/*** /***
* @Description 点赞和踩 * @Description 点赞和踩

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 @Override
public Result<EpdcNewsDetailResultDTO> getNewsDetail(String id) { public Result<EpdcNewsDetailResultDTO> getNewsDetail(EpdcNewsDetailFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "getNewsDetail", id); return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "getNewsDetail", formDto);
} }
@Override @Override

16
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); 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 点赞踩 * @Description 点赞踩

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 @Override
public Result<EpdcNewsDetailResultDTO> getNewsDetail(String id) { public Result<EpdcNewsDetailResultDTO> getNewsDetail(String newsId, String userId) {
return newsFeignClient.getNewsDetail(id); EpdcNewsDetailFormDTO form = new EpdcNewsDetailFormDTO();
form.setNewsId(newsId);
form.setUserId(userId);
return newsFeignClient.getNewsDetail(form);
} }
@Override @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;
}

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

@ -16,26 +16,22 @@ public class EpdcNewsDetailResultDTO implements Serializable {
private static final long serialVersionUID = 6765985767338100673L; 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 id;
private String newsTitle; private String newsTitle;
private String newsStartTime; private String newsStartTime;
private String deptName; private String deptName;
private String newsContent; private String newsContent;
private int readingAmount; private Integer readingAmount;
private int unlikeNumber; private Integer unlikeNumber;
private int likeNumber; private Integer likeNumber;
private String categoryName; private String categoryName;
/**
* 用户是否已点赞 0否1是
*/
private String likeFlag;
/**
* 用户是否已踩 0否1是
*/
private String unLikeFlag;
} }

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

@ -14,14 +14,6 @@ import java.io.Serializable;
public class EpdcNewsListResultDTO implements Serializable { public class EpdcNewsListResultDTO implements Serializable {
private static final long serialVersionUID = -7339344639815196599L; 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 id;
private String newsTitle; private String newsTitle;
@ -29,5 +21,4 @@ public class EpdcNewsListResultDTO implements Serializable {
private String deptName; private String deptName;
private String newsCategoryName; private String newsCategoryName;
private String newsImageUrl; 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.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.dto.BannerDTO; import com.elink.esua.epdc.dto.BannerDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcBannerListFromDTO; import com.elink.esua.epdc.dto.epdc.form.*;
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.result.EpdcBannerListResultDTO; 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.EpdcNewsDetailResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
@ -78,10 +75,9 @@ public class EpdcAppNewsController {
* @Exception * @Exception
* *
*/ */
@GetMapping("detail/{newsId}") @GetMapping("detail")
public Result<EpdcNewsDetailResultDTO> getNewsDetail(@PathVariable("newsId") String id) { public Result<EpdcNewsDetailResultDTO> getNewsDetail(@RequestBody EpdcNewsDetailFormDTO formDto) {
Result<EpdcNewsDetailResultDTO> newsDetail = newsService.getNewsDetail(id); return newsService.getNewsDetail(formDto);
return newsDetail;
} }
/*** /***

18
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; package com.elink.esua.epdc.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; 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.form.EpdcNewsListFromDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
@ -36,6 +37,7 @@ import java.util.List;
public interface NewsDao extends BaseDao<NewsEntity> { public interface NewsDao extends BaseDao<NewsEntity> {
int selectCountByCategoryId(String categoryId); int selectCountByCategoryId(String categoryId);
/*** /***
* @Description 新闻列表api * @Description 新闻列表api
* @Author qushutong * @Author qushutong
@ -47,14 +49,14 @@ public interface NewsDao extends BaseDao<NewsEntity> {
*/ */
List<EpdcNewsListResultDTO> selectListAppNews(EpdcNewsListFromDTO formDto); 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);
} }

16
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.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.NewsDTO; import com.elink.esua.epdc.dto.NewsDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcNewsBrowseFromDTO; 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.EpdcNewsListFromDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcNewsStatementFromDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcNewsStatementFromDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO; 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); 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 新闻点赞或踩 * @Description 新闻点赞或踩

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.dao.NewsDao;
import com.elink.esua.epdc.dto.NewsDTO; import com.elink.esua.epdc.dto.NewsDTO;
import com.elink.esua.epdc.dto.NewsUserAttitudeDTO; 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.dto.epdc.result.EpdcNewsListResultDTO;
import com.elink.esua.epdc.entity.NewsUserAttitudeEntity; import com.elink.esua.epdc.entity.NewsUserAttitudeEntity;
import com.elink.esua.epdc.enums.AppNewsLikeEnum; import com.elink.esua.epdc.enums.AppNewsLikeEnum;
@ -267,9 +268,9 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
} }
@Override @Override
public Result<EpdcNewsDetailResultDTO> getNewsDetail(String newsId) { public Result<EpdcNewsDetailResultDTO> getNewsDetail(EpdcNewsDetailFormDTO formDto) {
EpdcNewsDetailResultDTO epdcNewsDetailResultDTO = baseDao.selectOneAppNewsDetailById(newsId); EpdcNewsDetailResultDTO epdcNewsDetailResultDTO = baseDao.selectOneAppNewsDetail(formDto);
return new Result<EpdcNewsDetailResultDTO>().ok(epdcNewsDetailResultDTO); return new Result().ok(epdcNewsDetailResultDTO);
} }
@Override @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"> <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 id="selectCountByCategoryId" resultType="int">
SELECT SELECT
COUNT(*) AS count COUNT(*) AS count
@ -41,6 +11,7 @@
WHERE WHERE
NEWS_CATERORY_ID = #{categoryId} NEWS_CATERORY_ID = #{categoryId}
</select> </select>
<select id="selectListAppNews" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO"> <select id="selectListAppNews" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO">
SELECT SELECT
en.ID AS id, en.ID AS id,
@ -67,24 +38,27 @@
en.NEWS_RELEASE_START_TIME DESC en.NEWS_RELEASE_START_TIME DESC
LIMIT #{pageIndex},#{pageSize} LIMIT #{pageIndex},#{pageSize}
</select> </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 SELECT
en.ID AS id, en.ID AS id,
en.NEWS_TITLE AS newsTitle, en.NEWS_TITLE AS newsTitle,
en.NEWS_RELEASE_START_TIME AS newsStartTime, en.NEWS_RELEASE_START_TIME AS newsStartTime,
IFNULL( IFNULL( IFNULL(en.GRID, en.COMMUNITY), en.STREET ) AS deptName,
IFNULL(en.GRID, en.COMMUNITY),
en.STREET
) AS deptName,
en.NEWS_CONTENT AS newsContent, en.NEWS_CONTENT AS newsContent,
en.READING_AMOUNT AS readingAmount, en.READING_AMOUNT AS readingAmount,
en.UN_LIKE_NUMBER AS unlikeNumber, en.UN_LIKE_NUMBER AS unlikeNumber,
en.LIKE_NUMBER AS likeNumber, 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 FROM
epdc_news en epdc_news en
LEFT JOIN epdc_news_category nc ON en.NEWS_CATERORY_ID = nc.ID 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 WHERE
en.ID = #{id} en.ID = #{newsId}
</select> </select>
</mapper> </mapper>
Loading…
Cancel
Save