修改bug

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

@@ -149,7 +149,7 @@ public class ApiNewsController {
      * @date 2019/9/10 17:05
      */
     @GetMapping("information/listByUserId")
-    public Result<List<EpdcInformationListResultDTO>> listInformationByUserId(@LoginUser TokenDto userDetail, @RequestBody EpdcInformationListFormDTO formDto) {
+    public Result<List<EpdcInformationListResultDTO>> listInformationByUserId(@LoginUser TokenDto userDetail,EpdcInformationListFormDTO formDto) {
         return newsService.listInformationByUserId(userDetail, formDto);
     }
     /***
@@ -161,7 +161,12 @@ public class ApiNewsController {
      * @date 2019/9/11 9:21
      */
     @GetMapping("banner/list")
-    public Result<List<EpdcBannerListResultDTO>> listBanner(@LoginUser TokenDto userDetail) {
+    public Result<List<EpdcBannerListResultDTO>> listBanner(EpdcBannerListFromDTO fromDTO,@LoginUser TokenDto userDetail) {
-        return newsService.listBanner(userDetail);
+        return newsService.listBanner(fromDTO,userDetail);
+    }
+
+    @PostMapping("information/first")
+    public Result<EpdcIFristInfoResultDTO> 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,5 +1,6 @@
 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.*;
@@ -18,7 +19,7 @@ import java.util.List;
  * @email yujintao@elink-cn.com
  * @date 2019/9/5 19:20
  */
-@FeignClient(name = ServiceConstant.EPDC_NEWS_SERVER, fallback = NewsFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPDC_NEWS_SERVER, fallback = NewsFeignClientFallback.class, url = "http://localhost:9064")
 public interface NewsFeignClient {
 
     /**
@@ -138,11 +139,24 @@ public interface NewsFeignClient {
 
     /***
      * 移动端banner列表
-     * @param deptId
+     * @param fromDTO
      * @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
      */
-    @GetMapping(value = "news/epdc-app/news/list/{deptId}", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(value = "news/epdc-app/news/list", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<EpdcBannerListResultDTO>> listBanner(@PathVariable("deptId") Long deptId);
+    Result<List<EpdcBannerListResultDTO>> listBanner(@RequestBody EpdcBannerListFromDTO fromDTO);
+
+
+    /***
+     *  获取第一条通知消息
+     * @param userId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcIFristInfoResultDTO>
+     * @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);
+
+
 }

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

@@ -1,5 +1,6 @@
 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;
@@ -69,8 +70,13 @@ public class NewsFeignClientFallback implements NewsFeignClient {
     }
 
     @Override
-    public Result<List<EpdcBannerListResultDTO>> listBanner(Long deptId) {
+    public Result<List<EpdcBannerListResultDTO>> listBanner(EpdcBannerListFromDTO fromDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listBanner", deptId);
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listBanner", fromDTO);
+    }
+
+    @Override
+    public Result<EpdcIFristInfoResultDTO> 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

@@ -121,5 +121,15 @@ public interface NewsService {
      * @author qushutong
      * @date 2019/9/11 9:22
      */
-    Result<List<EpdcBannerListResultDTO>> listBanner(TokenDto userDetail);
+    Result<List<EpdcBannerListResultDTO>> listBanner(EpdcBannerListFromDTO fromDTO,TokenDto userDetail);
+
+
+    /***
+     *  获取最新一条消息通知
+     * @param userDetail
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcIFristInfoResultDTO>
+     * @author qushutong
+     * @date 2019/9/11 19:17
+     */
+    Result<EpdcIFristInfoResultDTO> selectOneFristByUserId(TokenDto userDetail);
 }

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

@@ -76,7 +76,14 @@ public class NewsServiceImpl implements NewsService {
     }
 
     @Override
-    public Result<List<EpdcBannerListResultDTO>> listBanner(TokenDto userDetail) {
+    public Result<List<EpdcBannerListResultDTO>> listBanner(EpdcBannerListFromDTO fromDTO,TokenDto userDetail) {
-        return newsFeignClient.listBanner(userDetail.getGridId());
+        fromDTO.setDeptId(userDetail.getGridId());
+        return newsFeignClient.listBanner(fromDTO);
+    }
+
+    @Override
+    public Result<EpdcIFristInfoResultDTO> selectOneFristByUserId(TokenDto userDetail) {
+        String userId=userDetail.getUserId();
+        return newsFeignClient.selectOneFristByUserId(userId);
     }
 }

esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/BannerDTO.java

@@ -143,4 +143,9 @@ public class BannerDTO implements Serializable {
      */
 	private String creatorName;
 
+    /***
+     * banner位置
+     */
+	private String position;
+
 }

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

@@ -0,0 +1,26 @@
+package com.elink.esua.epdc.dto.epdc.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author: qushutong
+ * @Date: 2019/9/11 17:10
+ * @Description: banner列表
+ */
+@Data
+public class EpdcBannerListFromDTO implements Serializable {
+    private static final long serialVersionUID = -178835849989066589L;
+
+    @NotBlank(message = "新闻位置不能为空")
+    private String position;
+    /**
+     * 网格ID
+     */
+    @NotNull(message = "网格ID不能为空")
+    private Long deptId;
+
+}

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

@@ -0,0 +1,28 @@
+package com.elink.esua.epdc.dto.epdc.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author: qushutong 首页第一条消息数据
+ * @Date: 2019/9/11 18:59
+ * @Description:
+ */
+@Data
+public class EpdcIFristInfoResultDTO 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,6 +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.EpdcInformationListResultDTO;
 import com.elink.esua.epdc.service.InformationService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -85,4 +86,9 @@ public class EpdcAppInformationController {
         ValidatorUtils.validateEntity(formDto);
         return this.informationService.listByUserId(formDto);
     }
+
+    @PostMapping("first/{userId}")
+    public Result<EpdcIFristInfoResultDTO> 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/controller/EpdcAppNewsController.java

@@ -21,6 +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;
@@ -121,8 +122,8 @@ public class EpdcAppNewsController {
      * @author qushutong
      * @date 2019/9/10 20:58
      */
-    @GetMapping("list/{deptId}")
+    @GetMapping("list")
-    public Result<List<EpdcBannerListResultDTO>> listBanner(@PathVariable("deptId") Long deptId ){
+    public Result<List<EpdcBannerListResultDTO>> listBanner(@RequestBody EpdcBannerListFromDTO fromDTO ){
-        return new Result<List<EpdcBannerListResultDTO>>().ok(bannerService.listBanner(deptId));
+        return new Result<List<EpdcBannerListResultDTO>>().ok(bannerService.listBanner(fromDTO));
     }
 }

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

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.BannerDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcBannerListFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO;
 import com.elink.esua.epdc.entity.BannerEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -35,10 +36,10 @@ import java.util.List;
 public interface BannerDao extends BaseDao<BannerEntity> {
     /***
      * banner 列表
-     * @param deptId
+     * @param fromDTO
      * @return java.util.List<com.elink.esua.epdc.dto.BannerDTO>
      * @author qushutong
      * @date 2019/9/11 9:00
      */
-    List<EpdcBannerListResultDTO> selectListBanner(Long deptId);
+    List<EpdcBannerListResultDTO> selectListBanner(EpdcBannerListFromDTO fromDTO);
 }

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

@@ -19,6 +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.EpdcInformationListResultDTO;
 import com.elink.esua.epdc.entity.InformationEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -43,4 +44,13 @@ public interface InformationDao extends BaseDao<InformationEntity> {
      * @date 2019/9/10 16:47
      */
     List<EpdcInformationListResultDTO> selectListInfromation(EpdcInformationListFormDTO formDto);
+
+    /***
+     *  s首页第一条包括未读数
+     * @param userId
+     * @return java.lang.Integer
+     * @author qushutong
+     * @date 2019/9/11 18:44
+     */
+    EpdcIFristInfoResultDTO selectOneFristByUserId(String userId);
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/BannerEntity.java

@@ -113,4 +113,9 @@ public class BannerEntity extends BaseEpdcEntity {
      */
 	private String creatorName;
 
+	/***
+	 * banner位置
+	 */
+	private String position;
+
 }

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

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.service;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.dto.BannerDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcBannerListFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO;
 import com.elink.esua.epdc.entity.BannerEntity;
 
@@ -95,10 +96,10 @@ public interface BannerService extends BaseService<BannerEntity> {
 
     /***
      *  banner列表
-     * @param deptId
+     * @param fromDTO
      * @return java.util.List<com.elink.esua.epdc.dto.BannerDTO>
      * @author qushutong
      * @date 2019/9/11 8:59
      */
-    List<EpdcBannerListResultDTO> listBanner(Long deptId);
+    List<EpdcBannerListResultDTO> listBanner(EpdcBannerListFromDTO fromDTO);
 }

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

@@ -24,6 +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.EpdcInformationListResultDTO;
 import com.elink.esua.epdc.entity.InformationEntity;
 
@@ -127,4 +128,13 @@ public interface InformationService extends BaseService<InformationEntity> {
      * @date 2019/9/10 16:43
      */
     Result<List<EpdcInformationListResultDTO>> listByUserId(EpdcInformationListFormDTO formDto);
+
+    /***
+     * S首页未读数和最新一条
+     * @param userId
+     * @return com.elink.esua.epdc.dto.epdc.result.EpdcIFristInfoResultDTO
+     * @author qushutong
+     * @date 2019/9/11 19:05
+     */
+    Result<EpdcIFristInfoResultDTO> selectOneFristByUserId(String userId);
 }

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

@@ -31,6 +31,7 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.BannerDao;
 import com.elink.esua.epdc.dto.BannerDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcBannerListFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO;
 import com.elink.esua.epdc.entity.BannerEntity;
 import com.elink.esua.epdc.feign.AdminFeignClient;
@@ -156,8 +157,8 @@ public class BannerServiceImpl extends BaseServiceImpl<BannerDao, BannerEntity>
     }
 
     @Override
-    public List<EpdcBannerListResultDTO> listBanner(Long deptId) {
+    public List<EpdcBannerListResultDTO> listBanner(EpdcBannerListFromDTO fromDTO) {
-        return baseDao.selectListBanner(deptId);
+        return baseDao.selectListBanner(fromDTO);
     }
 
 }

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

@@ -31,6 +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.EpdcInformationListResultDTO;
 import com.elink.esua.epdc.entity.InformationEntity;
 import com.elink.esua.epdc.service.InformationService;
@@ -127,4 +128,9 @@ public class InformationServiceImpl extends BaseServiceImpl<InformationDao, Info
         List<EpdcInformationListResultDTO> list = this.baseDao.selectListInfromation(formDto);
         return new Result().ok(list);
     }
+
+    @Override
+    public Result<EpdcIFristInfoResultDTO> selectOneFristByUserId(String userId) {
+        return new Result<EpdcIFristInfoResultDTO>().ok(baseDao.selectOneFristByUserId(userId));
+    }
 }

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

@@ -26,6 +26,7 @@
         <result property="communityId" column="COMMUNITY_ID"/>
         <result property="grid" column="GRID"/>
         <result property="creatorName" column="CREATOR_NAME"/>
+        <result property="position" column="POSITION"/>
     </resultMap>
     <select id="selectListBanner" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO">
         SELECT
@@ -37,6 +38,7 @@
         LEFT JOIN epdc_banner_department ed ON ed.GRID_ID = #{deptId}
         WHERE
             eb.STATE = '1'
+        AND eb.POSITION = #{position}
         AND eb.DEL_FLAG = '0'
         AND ed.DEL_FLAG = '0'
     </select>

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

@@ -25,4 +25,20 @@
             im.READ_FLAG DESC, im.CREATED_TIME DESC
         LIMIT #{pageIndex},#{pageSize}
     </select>
+
+    <select id="selectOneFristByUserId" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcIFristInfoResultDTO">
+        SELECT
+        im.ID AS id,
+	    im.TITLE AS title,
+	    im.CREATED_TIME AS time,
+	    COUNT(im.ID) AS amount
+        FROM
+        epdc_information im
+        WHERE
+        im.USER_ID = #{userId}
+        AND im.READ_FLAG = '0'
+        ORDER BY
+            im.CREATED_TIME
+        LIMIT 0,1
+    </select>
 </mapper>