新增移动端老兵上报列表

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<java.util.List<com.elink.esua.epdc.dto.issue.result.IssueResultDTO>>
+     * @Version1.0
+     **/
+    @GetMapping("veteranList")
+    public Result<List<VeteranTopicDTO>> veteranList(@LoginUser TokenDto userDetail, VeteranFormDTO formDto) {
+        return issueService.listVeteran(userDetail, formDto);
+    }
 }

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<List<VeteranTopicDTO>> getlistVeteran(VeteranFormDTO formDto);
 }

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<List<VeteranTopicDTO>> getlistVeteran(VeteranFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getlistVeteran");
+    }
 }

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<List<EventTagsResultDTO>> listOfEventTags();
 
     Result submitVeterantopic(TokenDto userDetail, VeteranTopicDTO dto);
+
+    Result<List<VeteranTopicDTO>> listVeteran(TokenDto userDetail, VeteranFormDTO formDto);
 }

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<List<VeteranTopicDTO>> listVeteran(TokenDto userDetail, VeteranFormDTO formDto) {
+        formDto.setUserId(userDetail.getUserId());
+        return issueFeignClient.getlistVeteran(formDto);
+    }
 }

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;
+}

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<java.util.List<com.elink.esua.epdc.dto.issue.result.IssueResultDTO>>
+     * @Version1.0
+     **/
+    @GetMapping("getlistVeteran")
+    public Result<List<VeteranTopicDTO>> getlistVeteran(VeteranFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+
+        return veteranTopicService.listVeteran(formDto);
+    }
+
+
 }

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;
+
 /**
  * 老兵有话说
  *
@@ -30,4 +34,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface VeteranTopicDao extends BaseDao<VeteranTopicEntity> {
 
+
+    List<VeteranTopicDTO> selectlistVeteran(VeteranFormDTO formDto);
 }

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<VeteranTopicEntity> {
      * @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<java.util.List<com.elink.esua.epdc.dto.issue.result.IssueResultDTO>>
+     * @Version1.0
+     **/
+    Result<List<VeteranTopicDTO>> listVeteran(VeteranFormDTO formDto);
 }

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<VeteranTopicDao, Ve
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public Result<List<VeteranTopicDTO>> listVeteran(VeteranFormDTO formDto) {
+        int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
+        formDto.setPageIndex(pageIndex);
+        List<VeteranTopicDTO> data = baseDao.selectlistVeteran(formDto);
+
+        return new Result().ok(data);
+    }
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/VeteranTopicDao.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.elink.esua.epdc.dao.VeteranTopicDao">
+<mapper namespace="com.elink.esua.epdc.modules.events.dao.VeteranTopicDao">
 
-    <resultMap type="com.elink.esua.epdc.entity.VeteranTopicEntity" id="veteranTopicMap">
+    <resultMap type="com.elink.esua.epdc.modules.events.entity.VeteranTopicEntity" id="veteranTopicMap">
         <result property="id" column="ID"/>
         <result property="userId" column="USER_ID"/>
         <result property="nickName" column="NICK_NAME"/>
@@ -27,4 +27,8 @@
     </resultMap>
 
 
+    <select id="selectlistVeteran" resultType="com.elink.esua.epdc.dto.events.VeteranTopicDTO">
+      select * from epdc_veteran_topic
+      LIMIT #{pageIndex},#{pageSize}
+    </select>
 </mapper>