From 8aa0eb349abbe25e176b4bca55a6b65d859065c6 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Thu, 29 Feb 2024 17:59:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E8=80=81=E5=85=B5=E4=B8=8A=E6=8A=A5=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiIssueController.java | 14 ++++++ .../esua/epdc/feign/IssueFeignClient.java | 3 ++ .../fallback/IssueFeignClientFallback.java | 5 ++ .../elink/esua/epdc/service/IssueService.java | 3 ++ .../epdc/service/impl/IssueServiceImpl.java | 13 ++++-- .../epdc/dto/issue/form/VeteranFormDTO.java | 46 +++++++++++++++++++ .../controller/VeteranTopicController.java | 20 ++++++++ .../modules/events/dao/VeteranTopicDao.java | 8 +++- .../events/service/VeteranTopicService.java | 14 ++++++ .../service/impl/VeteranTopicServiceImpl.java | 13 ++++++ .../resources/mapper/item/VeteranTopicDao.xml | 8 +++- 11 files changed, 141 insertions(+), 6 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/VeteranFormDTO.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java index 683ecb54..243fb9e2 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java @@ -12,6 +12,7 @@ import com.elink.esua.epdc.dto.events.result.EventTagsResultDTO; import com.elink.esua.epdc.dto.issue.form.IssueFormDTO; import com.elink.esua.epdc.dto.issue.form.IssuesAndEventsOfMineFormDTO; import com.elink.esua.epdc.dto.issue.form.StatementFormDTO; +import com.elink.esua.epdc.dto.issue.form.VeteranFormDTO; import com.elink.esua.epdc.dto.issue.result.*; import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior; import com.elink.esua.epdc.service.IssueService; @@ -241,4 +242,17 @@ public class ApiIssueController { return issueService.submitVeterantopic(userDetail, dto); } + /** + * + * @description: 老兵列表 + * @author qushutong + * @date 2024/2/29 17:24 + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Version1.0 + **/ + @GetMapping("veteranList") + public Result> veteranList(@LoginUser TokenDto userDetail, VeteranFormDTO formDto) { + return issueService.listVeteran(userDetail, formDto); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java index 164e32c4..27c71845 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java @@ -124,4 +124,7 @@ public interface IssueFeignClient { @PostMapping(value = "events/epdc-app/event/veterantopic/submitVeterantopic", consumes = MediaType.APPLICATION_JSON_VALUE) Result submitVeterantopic(VeteranTopicDTO dto); + + @GetMapping(value = "events/epdc-app/event/veterantopic/getlistVeteran", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> getlistVeteran(VeteranFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/IssueFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/IssueFeignClientFallback.java index 1e0c79c9..b92459f6 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/IssueFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/IssueFeignClientFallback.java @@ -76,4 +76,9 @@ public class IssueFeignClientFallback implements IssueFeignClient { public Result submitVeterantopic(VeteranTopicDTO dto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "submitVeterantopic"); } + + @Override + public Result> getlistVeteran(VeteranFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getlistVeteran"); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java index 7fc361d4..d1194627 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java @@ -10,6 +10,7 @@ import com.elink.esua.epdc.dto.events.result.EventTagsResultDTO; import com.elink.esua.epdc.dto.issue.form.IssueFormDTO; import com.elink.esua.epdc.dto.issue.form.IssuesAndEventsOfMineFormDTO; import com.elink.esua.epdc.dto.issue.form.StatementFormDTO; +import com.elink.esua.epdc.dto.issue.form.VeteranFormDTO; import com.elink.esua.epdc.dto.issue.result.*; import java.util.List; @@ -117,4 +118,6 @@ public interface IssueService { Result> listOfEventTags(); Result submitVeterantopic(TokenDto userDetail, VeteranTopicDTO dto); + + Result> listVeteran(TokenDto userDetail, VeteranFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java index 8d013cfa..6954f078 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java @@ -32,6 +32,7 @@ import java.util.List; /** * 议题模块 + * * @Author LC * @Date 2019/9/6 20:15 */ @@ -93,7 +94,7 @@ public class IssueServiceImpl implements IssueService { //事件ID返参赋值 Result result = issueFeignClient.submitEvent(formDto); - if(result.success()){ + if (result.success()) { formDto.setId(String.valueOf(result.getData())); } return result; @@ -120,9 +121,9 @@ public class IssueServiceImpl implements IssueService { wxMaSecCheckTask.checkImage(file); // 转base64 in = new FileInputStream(file); - byte[] bytes=new byte[(int)file.length()]; + byte[] bytes = new byte[(int) file.length()]; in.read(bytes); - base64 = "data:image/png;base64,"+Base64.getEncoder().encodeToString(bytes); + base64 = "data:image/png;base64," + Base64.getEncoder().encodeToString(bytes); // 图片上传至OSS UploadFormDTO formDTO = new UploadFormDTO(); formDTO.setBase64String(base64); @@ -205,4 +206,10 @@ public class IssueServiceImpl implements IssueService { dto.setMobile(userDetail.getMobile()); return issueFeignClient.submitVeterantopic(dto); } + + @Override + public Result> listVeteran(TokenDto userDetail, VeteranFormDTO formDto) { + formDto.setUserId(userDetail.getUserId()); + return issueFeignClient.getlistVeteran(formDto); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/VeteranFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/VeteranFormDTO.java new file mode 100644 index 00000000..2b95efd1 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/VeteranFormDTO.java @@ -0,0 +1,46 @@ +package com.elink.esua.epdc.dto.issue.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.Date; + + +/** + * + * @description: + * @author qushutong + * @date 2024/2/29 17:21 + * @param + * @return + * @Version1.0 + **/ +@Data +public class VeteranFormDTO implements Serializable { + private static final long serialVersionUID = -8864248267071206774L; + + /** + * 页码，从1开始 + */ + @Min(value = 1, message = "页码必须大于0") + private int pageIndex; + /** + * 页容量，默认20页 + */ + @Min(value = 1, message = "每页条数必须大于必须大于0") + private int pageSize = 20; + /** + * 第一页查询发起时的时间 + */ + @NotBlank(message = "时间戳不能为空") + private String timestamp; + + + /** + * 用户ID + */ + private String userId; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/VeteranTopicController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/VeteranTopicController.java index d5eb2d9d..5ce7e37b 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/VeteranTopicController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/VeteranTopicController.java @@ -26,6 +26,9 @@ 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.DefaultGroup; import com.elink.esua.epdc.dto.events.VeteranTopicDTO; +import com.elink.esua.epdc.dto.issue.form.IssueFormDTO; +import com.elink.esua.epdc.dto.issue.form.VeteranFormDTO; +import com.elink.esua.epdc.dto.issue.result.IssueResultDTO; import com.elink.esua.epdc.modules.events.excel.VeteranTopicExcel; import com.elink.esua.epdc.modules.events.service.VeteranTopicService; import org.springframework.beans.factory.annotation.Autowired; @@ -108,4 +111,21 @@ public class VeteranTopicController { return new Result(); } + /** + * + * @description: 获取老兵列表 + * @author qushutong + * @date 2024/2/29 17:38 + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Version1.0 + **/ + @GetMapping("getlistVeteran") + public Result> getlistVeteran(VeteranFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + + return veteranTopicService.listVeteran(formDto); + } + + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/VeteranTopicDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/VeteranTopicDao.java index 97ef6ad8..d516dd46 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/VeteranTopicDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/VeteranTopicDao.java @@ -18,9 +18,13 @@ package com.elink.esua.epdc.modules.events.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.events.VeteranTopicDTO; +import com.elink.esua.epdc.dto.issue.form.VeteranFormDTO; import com.elink.esua.epdc.modules.events.entity.VeteranTopicEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 老兵有话说 * @@ -29,5 +33,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface VeteranTopicDao extends BaseDao { - + + + List selectlistVeteran(VeteranFormDTO formDto); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/VeteranTopicService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/VeteranTopicService.java index c24cf0c4..66cc601f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/VeteranTopicService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/VeteranTopicService.java @@ -19,7 +19,10 @@ package com.elink.esua.epdc.modules.events.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.events.VeteranTopicDTO; +import com.elink.esua.epdc.dto.issue.form.VeteranFormDTO; +import com.elink.esua.epdc.dto.issue.result.IssueResultDTO; import com.elink.esua.epdc.modules.events.entity.VeteranTopicEntity; import java.util.List; @@ -92,4 +95,15 @@ public interface VeteranTopicService extends BaseService { * @date 2024-02-29 */ void delete(String[] ids); + + /** + * + * @description: + * @author qushutong + * @date 2024/2/29 17:42 + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Version1.0 + **/ + Result> listVeteran(VeteranFormDTO formDto); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/VeteranTopicServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/VeteranTopicServiceImpl.java index 23bcfe52..1e1a6b9b 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/VeteranTopicServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/VeteranTopicServiceImpl.java @@ -20,10 +20,14 @@ package com.elink.esua.epdc.modules.events.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.events.VeteranTopicDTO; +import com.elink.esua.epdc.dto.issue.form.VeteranFormDTO; +import com.elink.esua.epdc.dto.issue.result.IssueResultDTO; import com.elink.esua.epdc.modules.events.dao.VeteranTopicDao; import com.elink.esua.epdc.modules.events.entity.VeteranTopicEntity; import com.elink.esua.epdc.modules.events.service.VeteranTopicService; @@ -97,4 +101,13 @@ public class VeteranTopicServiceImpl extends BaseServiceImpl> listVeteran(VeteranFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + List data = baseDao.selectlistVeteran(formDto); + + return new Result().ok(data); + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/VeteranTopicDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/VeteranTopicDao.xml index d6fb6783..e81c077f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/VeteranTopicDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/VeteranTopicDao.xml @@ -1,9 +1,9 @@ - + - + @@ -27,4 +27,8 @@ + \ No newline at end of file