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 e03d1e76b..c84f92537 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 @@ -165,8 +165,16 @@ public class ApiNewsController { return newsService.listBanner(fromDTO, userDetail); } + /** + * 查询第一条消息，并返回消息未读数 + * + * @param userDetail + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2019/9/18 13:49 + */ @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 0d34452c2..35a3ddb84 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 @@ -1,6 +1,5 @@ package com.elink.esua.epdc.feign; -import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.epdc.form.*; @@ -150,12 +149,12 @@ public interface NewsFeignClient { /*** * 获取第一条通知消息 * @param userId - * @return com.elink.esua.epdc.commons.tools.utils.Result + * @return com.elink.esua.epdc.commons.tools.utils.Result * @author qushutong * @date 2019/9/11 19:20 */ @PostMapping(value = "news/epdc-app/information/first/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE) - Result selectOneFristByUserId(@PathVariable String userId); + Result selectOneFristByUserId(@PathVariable String userId); } 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 ab01c5b9d..c1a66fc6b 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 @@ -1,6 +1,5 @@ package com.elink.esua.epdc.feign.fallback; -import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -75,7 +74,7 @@ public class NewsFeignClientFallback implements NewsFeignClient { } @Override - public Result selectOneFristByUserId(String userId) { + public Result selectOneFristByUserId(String userId) { return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "selectOneFristByUserId", userId); } 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 eb3163013..77cf79fce 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 @@ -127,9 +127,9 @@ public interface NewsService { /*** * 获取最新一条消息通知 * @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 19:17 */ - Result selectOneFristByUserId(TokenDto userDetail); + Result selectOneFristByUserId(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 6348bde2d..3083efd38 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 @@ -79,14 +79,14 @@ public class NewsServiceImpl implements NewsService { } @Override - public Result> listBanner(EpdcBannerListFromDTO fromDTO,TokenDto userDetail) { + public Result> listBanner(EpdcBannerListFromDTO fromDTO, TokenDto userDetail) { fromDTO.setDeptId(userDetail.getGridId()); return newsFeignClient.listBanner(fromDTO); } @Override - public Result selectOneFristByUserId(TokenDto userDetail) { - String userId=userDetail.getUserId(); + public Result selectOneFristByUserId(TokenDto userDetail) { + String userId = userDetail.getUserId(); return newsFeignClient.selectOneFristByUserId(userId); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/test/java/com/elink/esua/epdc/UserTest.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/test/java/com/elink/esua/epdc/UserTest.java index 3f072a7be..5f659ea76 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/test/java/com/elink/esua/epdc/UserTest.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/test/java/com/elink/esua/epdc/UserTest.java @@ -3,7 +3,6 @@ package com.elink.esua.epdc; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.common.token.util.CpUserDetailRedis; import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.jwt.JwtTokenProperties; import com.elink.esua.epdc.jwt.JwtTokenUtils; import org.junit.Test; @@ -34,7 +33,7 @@ public class UserTest { @Test public void test(){ TokenDto tokenDto = new TokenDto(); - tokenDto.setUserId("userId_ttteeesssttt"); + tokenDto.setUserId("userId_ttteeesssttt0918"); tokenDto.setFaceImg("http://b-ssl.duitang.com/uploads/item/201707/19/20170719211350_4PnBt.jpeg"); tokenDto.setGridId(1169158285790900226L); tokenDto.setMobile("15555555555"); diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcIFristInfoResultDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcInformationFristResultDTO.java similarity index 71% rename from esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcIFristInfoResultDTO.java rename to esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcInformationFristResultDTO.java index 199460cf6..1ce0afc0b 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcIFristInfoResultDTO.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcInformationFristResultDTO.java @@ -10,19 +10,16 @@ import java.io.Serializable; * @Description: */ @Data -public class EpdcIFristInfoResultDTO implements Serializable { +public class EpdcInformationFristResultDTO implements Serializable { private static final long serialVersionUID = -8249847977818930805L; - /** - * id : 55864 - * title : FSqWVB8jbB - * time : 1568199504633 - * amount : 90109 - */ private String id; private String title; private String time; + /** + * 未读消息数 + */ private int amount; } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppInformationController.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppInformationController.java index 141075f71..ff65dd5cd 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppInformationController.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppInformationController.java @@ -23,7 +23,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationListFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationReadFormDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcIFristInfoResultDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcInformationFristResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcInformationListResultDTO; import com.elink.esua.epdc.service.InformationService; import org.springframework.beans.factory.annotation.Autowired; @@ -87,8 +87,16 @@ public class EpdcAppInformationController { return this.informationService.listByUserId(formDto); } + /** + * 获取第一条个人消息，并返回未读消息数 + * + * @param userId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2019/9/18 13:54 + */ @PostMapping("first/{userId}") - public Result selectOneFristByUserId(@PathVariable("userId") String userId){ + public Result selectOneFristByUserId(@PathVariable("userId") String userId) { return informationService.selectOneFristByUserId(userId); } } \ 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/dao/InformationDao.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/InformationDao.java index 012f75004..5ae5d6058 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/InformationDao.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/InformationDao.java @@ -19,7 +19,7 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationListFormDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcIFristInfoResultDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcInformationFristResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcInformationListResultDTO; import com.elink.esua.epdc.entity.InformationEntity; import org.apache.ibatis.annotations.Mapper; @@ -52,5 +52,5 @@ public interface InformationDao extends BaseDao { * @author qushutong * @date 2019/9/11 18:44 */ - EpdcIFristInfoResultDTO selectOneFristByUserId(String userId); + EpdcInformationFristResultDTO selectOneFristByUserId(String userId); } \ 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/InformationService.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/InformationService.java index c74530c19..889972dc5 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/InformationService.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/InformationService.java @@ -24,7 +24,7 @@ import com.elink.esua.epdc.dto.InformationDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationListFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationReadFormDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcIFristInfoResultDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcInformationFristResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcInformationListResultDTO; import com.elink.esua.epdc.entity.InformationEntity; @@ -132,9 +132,9 @@ public interface InformationService extends BaseService { /*** * S首页未读数和最新一条 * @param userId - * @return com.elink.esua.epdc.dto.epdc.result.EpdcIFristInfoResultDTO + * @return com.elink.esua.epdc.dto.epdc.result.EpdcInformationFristResultDTO * @author qushutong * @date 2019/9/11 19:05 */ - Result selectOneFristByUserId(String userId); + Result selectOneFristByUserId(String userId); } \ 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/impl/InformationServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/InformationServiceImpl.java index 48861d184..c9f7d5fe7 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/InformationServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/InformationServiceImpl.java @@ -31,7 +31,7 @@ import com.elink.esua.epdc.dto.InformationDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationListFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationReadFormDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcIFristInfoResultDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcInformationFristResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcInformationListResultDTO; import com.elink.esua.epdc.entity.InformationEntity; import com.elink.esua.epdc.service.InformationService; @@ -40,7 +40,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; -import java.util.Date; import java.util.List; import java.util.Map; @@ -130,7 +129,7 @@ public class InformationServiceImpl extends BaseServiceImpl selectOneFristByUserId(String userId) { - return new Result().ok(baseDao.selectOneFristByUserId(userId)); + public Result selectOneFristByUserId(String userId) { + return new Result().ok(baseDao.selectOneFristByUserId(userId)); } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/InformationDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/InformationDao.xml index f361b0f2e..657c863a9 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/InformationDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/InformationDao.xml @@ -26,19 +26,16 @@ LIMIT #{pageIndex},#{pageSize} - SELECT - im.ID AS id, - im.TITLE AS title, - im.CREATED_TIME AS time, - COUNT(im.ID) AS amount + i.ID, + i.TITLE, + i.CREATED_TIME AS `time`, + (SELECT count(*) FROM epdc_information ii WHERE ii.READ_FLAG = '0' AND ii.USER_ID = #{userId}) amount FROM - epdc_information im - WHERE - im.USER_ID = #{userId} - AND im.READ_FLAG = '0' - ORDER BY - im.CREATED_TIME - LIMIT 0,1 + epdc_information i + WHERE i.USER_ID = #{userId} and i.del_flag = '0' + ORDER BY i.CREATED_TIME DESC + LIMIT 1 \ No newline at end of file