新闻相关修改

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<com.elink.esua.epdc.dto.epdc.result.EpdcInformationFristResultDTO>
+     * @author work@yujt.net.cn
+     * @date 2019/9/18 13:49
+     */
     @PostMapping("information/first")
-    public Result<EpdcIFristInfoResultDTO> selectOneFristByUserId(@LoginUser TokenDto userDetail) {
+    public Result<EpdcInformationFristResultDTO> selectOneFristByUserId(@LoginUser TokenDto userDetail) {
         return newsService.selectOneFristByUserId(userDetail);
     }
 }

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<com.elink.esua.epdc.dto.epdc.result.EpdcIFristInfoResultDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcInformationFristResultDTO>
      * @author qushutong
      * @date 2019/9/11 19:20
      */
     @PostMapping(value = "news/epdc-app/information/first/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<EpdcIFristInfoResultDTO> selectOneFristByUserId(@PathVariable String userId);
+    Result<EpdcInformationFristResultDTO> selectOneFristByUserId(@PathVariable String userId);
 
 
 }

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<EpdcIFristInfoResultDTO> selectOneFristByUserId(String userId) {
+    public Result<EpdcInformationFristResultDTO> selectOneFristByUserId(String userId) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "selectOneFristByUserId", userId);
     }
 

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<com.elink.esua.epdc.dto.epdc.result.EpdcIFristInfoResultDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcInformationFristResultDTO>
      * @author qushutong
      * @date 2019/9/11 19:17
      */
-    Result<EpdcIFristInfoResultDTO> selectOneFristByUserId(TokenDto userDetail);
+    Result<EpdcInformationFristResultDTO> selectOneFristByUserId(TokenDto userDetail);
 }

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<List<EpdcBannerListResultDTO>> listBanner(EpdcBannerListFromDTO fromDTO,TokenDto userDetail) {
+    public Result<List<EpdcBannerListResultDTO>> listBanner(EpdcBannerListFromDTO fromDTO, TokenDto userDetail) {
         fromDTO.setDeptId(userDetail.getGridId());
         return newsFeignClient.listBanner(fromDTO);
     }
 
     @Override
-    public Result<EpdcIFristInfoResultDTO> selectOneFristByUserId(TokenDto userDetail) {
+    public Result<EpdcInformationFristResultDTO> selectOneFristByUserId(TokenDto userDetail) {
-        String userId=userDetail.getUserId();
+        String userId = userDetail.getUserId();
         return newsFeignClient.selectOneFristByUserId(userId);
     }
 }

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");

esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcIFristInfoResultDTO.java → 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;
 
 }

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<com.elink.esua.epdc.dto.epdc.result.EpdcInformationFristResultDTO>
+     * @author work@yujt.net.cn
+     * @date 2019/9/18 13:54
+     */
     @PostMapping("first/{userId}")
-    public Result<EpdcIFristInfoResultDTO> selectOneFristByUserId(@PathVariable("userId") String userId){
+    public Result<EpdcInformationFristResultDTO> selectOneFristByUserId(@PathVariable("userId") String userId) {
         return informationService.selectOneFristByUserId(userId);
     }
 }

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<InformationEntity> {
      * @author qushutong
      * @date 2019/9/11 18:44
      */
-    EpdcIFristInfoResultDTO selectOneFristByUserId(String userId);
+    EpdcInformationFristResultDTO selectOneFristByUserId(String userId);
 }

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<InformationEntity> {
     /***
      * 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<EpdcIFristInfoResultDTO> selectOneFristByUserId(String userId);
+    Result<EpdcInformationFristResultDTO> selectOneFristByUserId(String userId);
 }

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<InformationDao, Info
     }
 
     @Override
-    public Result<EpdcIFristInfoResultDTO> selectOneFristByUserId(String userId) {
+    public Result<EpdcInformationFristResultDTO> selectOneFristByUserId(String userId) {
-        return new Result<EpdcIFristInfoResultDTO>().ok(baseDao.selectOneFristByUserId(userId));
+        return new Result<EpdcInformationFristResultDTO>().ok(baseDao.selectOneFristByUserId(userId));
     }
 }

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

@@ -26,19 +26,16 @@
         LIMIT #{pageIndex},#{pageSize}
     </select>
 
-    <select id="selectOneFristByUserId" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcIFristInfoResultDTO">
+    <select id="selectOneFristByUserId" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcInformationFristResultDTO">
         SELECT
-        im.ID AS id,
+            i.ID,
-	    im.TITLE AS title,
+            i.TITLE,
-	    im.CREATED_TIME AS time,
+            i.CREATED_TIME AS `time`,
-	    COUNT(im.ID) AS amount
+            (SELECT count(*) FROM epdc_information ii WHERE ii.READ_FLAG = '0' AND ii.USER_ID = #{userId}) amount
         FROM
-        epdc_information im
+            epdc_information i
-        WHERE
+            WHERE i.USER_ID = #{userId} and i.del_flag = '0'
-        im.USER_ID = #{userId}
+            ORDER BY i.CREATED_TIME DESC
-        AND im.READ_FLAG = '0'
+            LIMIT 1
-        ORDER BY
-            im.CREATED_TIME
-        LIMIT 0,1
     </select>
 </mapper>