diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml index 04bf197cf..ef8c6fb16 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml @@ -126,8 +126,8 @@ false 47.104.224.45:8848 - wx6ff4e50840cf7dfc - caf82e454ae4e2cb9697651194c37784 + wx3ef8f2cd12a19fcb + 948aa2f21dbaa3943288ea5b119ac6f2 111 111 @@ -154,8 +154,8 @@ true 47.104.224.45:8848 - wx6ff4e50840cf7dfc - caf82e454ae4e2cb9697651194c37784 + wx3ef8f2cd12a19fcb + 948aa2f21dbaa3943288ea5b119ac6f2 111 111 @@ -182,8 +182,8 @@ false 47.104.224.45:8848 - wx62aba559696345af - a93c3dd28ce34fb96228830141e51549 + wx3ef8f2cd12a19fcb + 948aa2f21dbaa3943288ea5b119ac6f2 111 111 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java index 840a5e27c..88ecac33c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java +++ b/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 getNewsDetail(@PathVariable("newsId") String id) { - Result newsDetail = newsService.getNewsDetail(id); + public Result getNewsDetail(@PathVariable("newsId") String id, @LoginUser TokenDto userDetail) { + Result 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> listInformationByUserId(@LoginUser TokenDto userDetail,EpdcInformationListFormDTO formDto) { + public Result> listInformationByUserId(@LoginUser TokenDto userDetail, EpdcInformationListFormDTO formDto) { return newsService.listInformationByUserId(userDetail, formDto); } + /*** * banner 列表 * @param userDetail * @param - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author qushutong * @date 2019/9/11 9:21 */ @GetMapping("banner/list") - public Result> listBanner(EpdcBannerListFromDTO fromDTO,@LoginUser TokenDto userDetail) { - return newsService.listBanner(fromDTO,userDetail); + public Result> listBanner(EpdcBannerListFromDTO fromDTO, @LoginUser TokenDto userDetail) { + return newsService.listBanner(fromDTO, userDetail); } @PostMapping("information/first") - public Result selectOneFristByUserId(@LoginUser TokenDto userDetail){ + public Result selectOneFristByUserId(@LoginUser TokenDto userDetail) { return newsService.selectOneFristByUserId(userDetail); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java index a617f5008..bd022771d 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java +++ b/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> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @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> + * @Return com.elink.esua.epdc.commons.tools.utils.Result> * @Exception * */ @GetMapping(value = "news/epdc-app/news/listNews", consumes = MediaType.APPLICATION_JSON_VALUE) Result> listNews(@RequestBody EpdcNewsListFromDTO formDto); - /*** - * @Description 获取详情 - * @Author qushutong - * @Date 2019/9/9 10:20 - * @Param id - * @Return com.elink.esua.epdc.commons.tools.utils.Result - * @Exception + /** + * 移动端获取新闻详情 * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author yujintao + * @date 2019/9/12 10:46 */ - @GetMapping("news/epdc-app/news/detail/{newsId}") - Result getNewsDetail(@PathVariable("newsId") String id); + @GetMapping(value = "news/epdc-app/news/detail", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getNewsDetail(EpdcNewsDetailFormDTO formDto); /*** * @Description 点赞和踩 @@ -130,7 +129,7 @@ public interface NewsFeignClient { * 移动端用户消息列表 * * @param formDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @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> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author qushutong * @date 2019/9/11 9:25 */ diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java index bd17836ac..ab01c5b9d 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java +++ b/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 getNewsDetail(String id) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "getNewsDetail", id); + public Result getNewsDetail(EpdcNewsDetailFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "getNewsDetail", formDto); } @Override diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java index a1e424ddf..faef640e0 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java +++ b/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> 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 - * @Exception + /** + * 移动端获取新闻详情 * + * @param newsId 新闻ID + * @param userId 用户ID + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author yujintao + * @date 2019/9/12 10:45 */ - Result getNewsDetail(String id); + Result 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> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author qushutong * @date 2019/9/11 9:22 */ - Result> listBanner(EpdcBannerListFromDTO fromDTO,TokenDto userDetail); + Result> listBanner(EpdcBannerListFromDTO fromDTO, TokenDto userDetail); /*** diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java index 0c776f6e0..02b6e2899 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java +++ b/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 getNewsDetail(String id) { - return newsFeignClient.getNewsDetail(id); + public Result getNewsDetail(String newsId, String userId) { + EpdcNewsDetailFormDTO form = new EpdcNewsDetailFormDTO(); + form.setNewsId(newsId); + form.setUserId(userId); + return newsFeignClient.getNewsDetail(form); } @Override diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsDetailFormDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsDetailFormDTO.java new file mode 100644 index 000000000..62a1f57ef --- /dev/null +++ b/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; +} diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNewsDetailResultDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNewsDetailResultDTO.java index 2450b75f0..81715fe5d 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNewsDetailResultDTO.java +++ b/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; } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNewsListResultDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNewsListResultDTO.java index d32d26b4f..86c06581b 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNewsListResultDTO.java +++ b/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; - } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNewsController.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNewsController.java index a97f9b0cb..083d4bddb 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNewsController.java +++ b/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 getNewsDetail(@PathVariable("newsId") String id) { - Result newsDetail = newsService.getNewsDetail(id); - return newsDetail; + @GetMapping("detail") + public Result getNewsDetail(@RequestBody EpdcNewsDetailFormDTO formDto) { + return newsService.getNewsDetail(formDto); } /*** diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsDao.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsDao.java index ae7b5779e..719d140ec 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsDao.java +++ b/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 { int selectCountByCategoryId(String categoryId); + /*** - * @Description 新闻列表api - * @Author qushutong - * @Date 2019/9/7 12:13 - * @Param [formDto] - * @Return java.util.List + * @Description 新闻列表api + * @Author qushutong + * @Date 2019/9/7 12:13 + * @Param [formDto] + * @Return java.util.List * @Exception * */ List 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); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsService.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsService.java index e8d888447..034b1f4d3 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsService.java +++ b/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 { */ Result> listNews(EpdcNewsListFromDTO formDto); - /*** - * @Description 获取新闻详情 - * @Author qushutong - * @Date 2019/9/7 13:35 - * @Param [newsId] - * @Return com.elink.esua.epdc.commons.tools.utils.Result - * @Exception + /** + * 获取新闻详情 * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author yujintao + * @date 2019/9/12 10:40 */ - Result getNewsDetail(String newsId); + Result getNewsDetail(EpdcNewsDetailFormDTO formDto); /*** * @Description 新闻点赞或踩 @@ -159,11 +159,11 @@ public interface NewsService extends BaseService { 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 * */ diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java index dbe8b77e1..a39bf4861 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java +++ b/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 implem } @Override - public Result getNewsDetail(String newsId) { - EpdcNewsDetailResultDTO epdcNewsDetailResultDTO = baseDao.selectOneAppNewsDetailById(newsId); - return new Result().ok(epdcNewsDetailResultDTO); + public Result getNewsDetail(EpdcNewsDetailFormDTO formDto) { + EpdcNewsDetailResultDTO epdcNewsDetailResultDTO = baseDao.selectOneAppNewsDetail(formDto); + return new Result().ok(epdcNewsDetailResultDTO); } @Override diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml index 93f36c748..ab5c62596 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml @@ -3,36 +3,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - 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} + \ No newline at end of file