Browse Source

获取通知详情接口

dev
yujintao 6 years ago
parent
commit
0b7f2f4c69
  1. 4
      esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/Constant.java
  2. 18
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java
  3. 16
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java
  4. 10
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java
  5. 13
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java
  6. 10
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java
  7. 5
      esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNoticeFormDTO.java
  8. 46
      esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeDetailResultDTO.java
  9. 5
      esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeResultDTO.java
  10. 72
      esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNoticeController.java
  11. 15
      esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NoticeController.java
  12. 12
      esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NoticeDao.java
  13. 13
      esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NoticeService.java
  14. 9
      esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java
  15. 14
      esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml

4
esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/Constant.java

@ -105,4 +105,8 @@ public interface Constant {
* 版本控制用 * 版本控制用
*/ */
String VERSION_CONTROL = "/{version}"; String VERSION_CONTROL = "/{version}";
/**
* 移动端接口标识
*/
String EPDC_APP = "epdc-app/";
} }

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

@ -4,6 +4,7 @@ import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
import com.elink.esua.epdc.service.NewsService; import com.elink.esua.epdc.service.NewsService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -35,7 +36,20 @@ public class ApiNewsController {
* @date 2019/9/5 20:17 * @date 2019/9/5 20:17
*/ */
@GetMapping("notice/list") @GetMapping("notice/list")
public Result<List<EpdcNoticeResultDTO>> noticeList(@LoginUser TokenDto userDetail, EpdcNoticeFormDTO formDto) { public Result<List<EpdcNoticeResultDTO>> listNotice(@LoginUser TokenDto userDetail, EpdcNoticeFormDTO formDto) {
return newsService.noticeList(userDetail, formDto); return newsService.listNotice(userDetail, formDto);
}
/**
* 查询通知详情
*
* @param noticeId
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO>
* @author yujintao
* @date 2019/9/6 14:58
*/
@GetMapping("notice/detail/{noticeId}")
public Result<EpdcNoticeDetailResultDTO> getNoticeDetail(@PathVariable("noticeId") String noticeId) {
return newsService.getNoticeDetail(noticeId);
} }
} }

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

@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
import com.elink.esua.epdc.feign.fallback.NewsFeignClientFallback; import com.elink.esua.epdc.feign.fallback.NewsFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
@ -29,6 +30,17 @@ public interface NewsFeignClient {
* @author yujintao * @author yujintao
* @date 2019/9/5 20:07 * @date 2019/9/5 20:07
*/ */
@GetMapping(value = "news/notice/listNoticeForApp", consumes = MediaType.APPLICATION_JSON_VALUE) @GetMapping(value = "news/epdc-app/notice/listNotice", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<List<EpdcNoticeResultDTO>> listNoticeForApp(EpdcNoticeFormDTO formDto); Result<List<EpdcNoticeResultDTO>> listNotice(EpdcNoticeFormDTO formDto);
/**
* 获取通知详情
*
* @param noticeId
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO>
* @author yujintao
* @date 2019/9/6 14:55
*/
@GetMapping("getDetail/{noticeId}")
Result<EpdcNoticeDetailResultDTO> getNoticeDetail(@PathVariable String noticeId);
} }

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

@ -4,6 +4,7 @@ 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.ModuleUtils;
import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
import com.elink.esua.epdc.feign.NewsFeignClient; import com.elink.esua.epdc.feign.NewsFeignClient;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -19,7 +20,12 @@ import java.util.List;
public class NewsFeignClientFallback implements NewsFeignClient { public class NewsFeignClientFallback implements NewsFeignClient {
@Override @Override
public Result<List<EpdcNoticeResultDTO>> listNoticeForApp(EpdcNoticeFormDTO formDto) { public Result<List<EpdcNoticeResultDTO>> listNotice(EpdcNoticeFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listNoticeForApp", formDto); return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "listNotice", formDto);
}
@Override
public Result<EpdcNoticeDetailResultDTO> getNoticeDetail(String noticeId) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "getNoticeDetail", noticeId);
} }
} }

13
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java

@ -3,6 +3,7 @@ package com.elink.esua.epdc.service;
import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
import java.util.List; import java.util.List;
@ -25,5 +26,15 @@ public interface NewsService {
* @author yujintao * @author yujintao
* @date 2019/9/5 20:17 * @date 2019/9/5 20:17
*/ */
Result<List<EpdcNoticeResultDTO>> noticeList(TokenDto userDetail, EpdcNoticeFormDTO formDto); Result<List<EpdcNoticeResultDTO>> listNotice(TokenDto userDetail, EpdcNoticeFormDTO formDto);
/**
* 查询通知详情
*
* @param noticeId
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO>
* @author yujintao
* @date 2019/9/6 14:58
*/
Result<EpdcNoticeDetailResultDTO> getNoticeDetail(String noticeId);
} }

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

@ -3,6 +3,7 @@ package com.elink.esua.epdc.service.impl;
import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
import com.elink.esua.epdc.feign.NewsFeignClient; import com.elink.esua.epdc.feign.NewsFeignClient;
import com.elink.esua.epdc.service.NewsService; import com.elink.esua.epdc.service.NewsService;
@ -25,8 +26,13 @@ public class NewsServiceImpl implements NewsService {
private NewsFeignClient newsFeignClient; private NewsFeignClient newsFeignClient;
@Override @Override
public Result<List<EpdcNoticeResultDTO>> noticeList(TokenDto userDetail, EpdcNoticeFormDTO formDto) { public Result<List<EpdcNoticeResultDTO>> listNotice(TokenDto userDetail, EpdcNoticeFormDTO formDto) {
formDto.setDeptId(userDetail.getGridId()); formDto.setDeptId(userDetail.getGridId());
return newsFeignClient.listNoticeForApp(formDto); return newsFeignClient.listNotice(formDto);
}
@Override
public Result<EpdcNoticeDetailResultDTO> getNoticeDetail(String noticeId) {
return newsFeignClient.getNoticeDetail(noticeId);
} }
} }

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

@ -4,6 +4,7 @@ import lombok.Data;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.io.Serializable;
/** /**
* 移动端通知列表查询条件 * 移动端通知列表查询条件
@ -13,7 +14,9 @@ import javax.validation.constraints.NotNull;
* @date 2019/9/5 19:40 * @date 2019/9/5 19:40
*/ */
@Data @Data
public class EpdcNoticeFormDTO { public class EpdcNoticeFormDTO implements Serializable {
private static final long serialVersionUID = 4209188661412055700L;
/** /**
* 用户所属网格ID * 用户所属网格ID

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

@ -0,0 +1,46 @@
package com.elink.esua.epdc.dto.epdc.result;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 通知详情
*
* @author yujintao
* @email yujintao@elink-cn.com
* @date 2019/9/6 14:34
*/
@Data
public class EpdcNoticeDetailResultDTO implements Serializable {
private static final long serialVersionUID = -3010031928679964025L;
/**
* id
*/
private String id;
/**
* 通知标题
*/
private String noticeTitle;
/**
* 通知发布时间
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date noticeTime;
/**
* 通知所属部门
*/
private String deptName;
/**
* 内容
*/
private String noticeContent;
/**
* 阅读量
*/
private Integer readingAmount;
}

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

@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.epdc.result;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import java.io.Serializable;
import java.util.Date; import java.util.Date;
/** /**
@ -13,7 +14,9 @@ import java.util.Date;
* @date 2019/9/5 19:30 * @date 2019/9/5 19:30
*/ */
@Data @Data
public class EpdcNoticeResultDTO { public class EpdcNoticeResultDTO implements Serializable {
private static final long serialVersionUID = 5512811033767022087L;
/** /**
* 通知ID * 通知ID

72
esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNoticeController.java

@ -0,0 +1,72 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.controller;
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.epdc.form.EpdcNoticeFormDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
import com.elink.esua.epdc.service.NoticeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 通知表
*
* @author yujintao yujintao@elink-cn.com
* @since v1.0.0 2019-09-04
*/
@RestController
@RequestMapping(Constant.EPDC_APP + "notice")
public class EpdcAppNoticeController {
@Autowired
private NoticeService noticeService;
/**
* 移动端通知列表
*
* @param formDto
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO>>
* @author yujintao
* @date 2019/9/5 19:43
*/
@GetMapping("listNotice")
public Result<List<EpdcNoticeResultDTO>> listNotice(@RequestBody EpdcNoticeFormDTO formDto) {
ValidatorUtils.validateEntity(formDto);
return this.noticeService.listNotice(formDto);
}
/**
* 获取通知详情
*
* @param noticeId
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO>>
* @author yujintao
* @date 2019/9/6 14:33
*/
@GetMapping("getDetail/{noticeId}")
public Result<EpdcNoticeDetailResultDTO> getDetail(@PathVariable String noticeId) {
return this.noticeService.getNoticeDetailById(noticeId);
}
}

15
esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NoticeController.java

@ -26,8 +26,6 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
import com.elink.esua.epdc.dto.NoticeDTO; import com.elink.esua.epdc.dto.NoticeDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
import com.elink.esua.epdc.excel.NoticeExcel; import com.elink.esua.epdc.excel.NoticeExcel;
import com.elink.esua.epdc.service.NoticeService; import com.elink.esua.epdc.service.NoticeService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -107,17 +105,4 @@ public class NoticeController {
return new Result(); return new Result();
} }
/**
* 移动端通知列表
*
* @param formDto
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO>>
* @author yujintao
* @date 2019/9/5 19:43
*/
@GetMapping("listNoticeForApp")
public Result<List<EpdcNoticeResultDTO>> listNoticeForApp(@RequestBody EpdcNoticeFormDTO formDto) {
ValidatorUtils.validateEntity(formDto);
return this.noticeService.listNoticeForApp(formDto);
}
} }

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

@ -19,9 +19,11 @@ 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.EpdcNoticeFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
import com.elink.esua.epdc.entity.NoticeEntity; import com.elink.esua.epdc.entity.NoticeEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@ -43,4 +45,14 @@ public interface NoticeDao extends BaseDao<NoticeEntity> {
* @date 2019/9/5 19:51 * @date 2019/9/5 19:51
*/ */
List<EpdcNoticeResultDTO> selectListAppNotice(EpdcNoticeFormDTO formDto); List<EpdcNoticeResultDTO> selectListAppNotice(EpdcNoticeFormDTO formDto);
/**
* 查询通知详情
*
* @param noticeId
* @return com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO
* @author yujintao
* @date 2019/9/6 14:46
*/
EpdcNoticeDetailResultDTO selectOneAppNotice(@Param("noticeId") String noticeId);
} }

13
esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NoticeService.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.NoticeDTO; import com.elink.esua.epdc.dto.NoticeDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
import com.elink.esua.epdc.entity.NoticeEntity; import com.elink.esua.epdc.entity.NoticeEntity;
@ -114,5 +115,15 @@ public interface NoticeService extends BaseService<NoticeEntity> {
* @author yujintao * @author yujintao
* @date 2019/9/5 19:37 * @date 2019/9/5 19:37
*/ */
Result<List<EpdcNoticeResultDTO>> listNoticeForApp(EpdcNoticeFormDTO formDto); Result<List<EpdcNoticeResultDTO>> listNotice(EpdcNoticeFormDTO formDto);
/**
* 查询通知详情
*
* @param noticeId
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO>
* @author yujintao
* @date 2019/9/6 14:45
*/
Result<EpdcNoticeDetailResultDTO> getNoticeDetailById(String noticeId);
} }

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

@ -33,6 +33,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dao.NoticeDao; import com.elink.esua.epdc.dao.NoticeDao;
import com.elink.esua.epdc.dto.NoticeDTO; import com.elink.esua.epdc.dto.NoticeDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeFormDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeResultDTO;
import com.elink.esua.epdc.entity.NoticeEntity; import com.elink.esua.epdc.entity.NoticeEntity;
import com.elink.esua.epdc.feign.AdminFeignClient; import com.elink.esua.epdc.feign.AdminFeignClient;
@ -187,11 +188,17 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
} }
@Override @Override
public Result<List<EpdcNoticeResultDTO>> listNoticeForApp(EpdcNoticeFormDTO formDto) { public Result<List<EpdcNoticeResultDTO>> listNotice(EpdcNoticeFormDTO formDto) {
int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
formDto.setPageIndex(pageIndex); formDto.setPageIndex(pageIndex);
List<EpdcNoticeResultDTO> noticeList = this.baseDao.selectListAppNotice(formDto); List<EpdcNoticeResultDTO> noticeList = this.baseDao.selectListAppNotice(formDto);
return new Result().ok(noticeList); return new Result().ok(noticeList);
} }
@Override
public Result<EpdcNoticeDetailResultDTO> getNoticeDetailById(String noticeId) {
EpdcNoticeDetailResultDTO dto = this.baseDao.selectOneAppNotice(noticeId);
return new Result().ok(dto);
}
} }

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

@ -21,4 +21,18 @@
en.RELEASE_TIME DESC en.RELEASE_TIME DESC
LIMIT #{pageIndex},#{pageSize} LIMIT #{pageIndex},#{pageSize}
</select> </select>
<select id="selectOneAppNotice" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO">
SELECT
n.ID,
n.NOTICE_TITLE AS noticeTitle,
n.NOTICE_CONTENT AS noticeContent,
n.READING_AMOUNT AS readingAmount,
n.RELEASE_TIME AS noticeTime,
IFNULL( IFNULL( en.GRID, en.COMMUNITY ), en.STREET ) AS deptName
FROM
epdc_notice n
WHERE
n.ID = #{noticeId}
</select>
</mapper> </mapper>
Loading…
Cancel
Save