话题审核记录接口 init

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiTopicController.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.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO;
@@ -11,6 +12,8 @@ import com.elink.esua.epdc.service.TopicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  *
  * 移动端接口-话题模块
@@ -68,4 +71,18 @@ public class ApiTopicController {
         ValidatorUtils.validateEntity(formDto);
         return topicService.closeTopic(userDetail, formDto);
     }
+
+    /**
+     *
+     * 话题审核记录
+     *
+     * @params [topicId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO>>
+     * @author liuchuang
+     * @since 2019/11/8 9:39
+     */
+    @GetMapping("auditRecord/{topicId}")
+    public Result<List<TopicAuditRecordResultDTO>> auditRecord(@PathVariable("topicId") String topicId) {
+        return topicService.listOfTopicAuditRecord(topicId);
+    }
 }

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

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO;
@@ -12,6 +13,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 
+import java.util.List;
+
 /**
  *
  * 社群-话题模块调用
@@ -57,4 +60,16 @@ public interface TopicFeignClient {
      */
     @PostMapping(value = "group/epdc-app/topic/close", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result close(TopicCloseFormDTO formDto);
+
+    /**
+     *
+     * 话题审核记录
+     *
+     * @params [topicId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO>>
+     * @author liuchuang
+     * @since 2019/11/8 9:41
+     */
+    @GetMapping(value = "group/epdc-app/topic/auditRecord/{topicId}", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<TopicAuditRecordResultDTO>> auditRecord(@PathVariable("topicId") String topicId);
 }

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

@@ -3,11 +3,15 @@ package com.elink.esua.epdc.feign.fallback;
 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;
+import com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO;
 import com.elink.esua.epdc.feign.TopicFeignClient;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PathVariable;
+
+import java.util.List;
 
 /**
  * @Author：liuchuang
@@ -30,4 +34,9 @@ public class TopicFeignClientFallback implements TopicFeignClient {
     public Result close(TopicCloseFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "close", formDto);
     }
+
+    @Override
+    public Result<List<TopicAuditRecordResultDTO>> auditRecord(@PathVariable("topicId") String topicId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "auditRecord", topicId);
+    }
 }

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

@@ -2,10 +2,13 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO;
 
+import java.util.List;
+
 /**
  *
  * 话题模块
@@ -47,4 +50,15 @@ public interface TopicService {
      * @since 2019/11/7 16:11
      */
     Result closeTopic(TokenDto userDetail, TopicCloseFormDTO formDto);
+
+    /**
+     *
+     * 话题审核记录
+     *
+     * @params [topicId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO>>
+     * @author liuchuang
+     * @since 2019/11/8 9:43
+     */
+    Result<List<TopicAuditRecordResultDTO>> listOfTopicAuditRecord(String topicId);
 }

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

@@ -4,6 +4,7 @@ import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.enums.TopicStateEnum;
+import com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO;
@@ -13,6 +14,8 @@ import com.elink.esua.epdc.service.TopicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  *
  * 话题模块
@@ -69,4 +72,9 @@ public class TopicServiceImpl implements TopicService {
         formDto.setUserId(userDetail.getUserId());
         return topicFeignClient.close(formDto);
     }
+
+    @Override
+    public Result<List<TopicAuditRecordResultDTO>> listOfTopicAuditRecord(String topicId) {
+        return topicFeignClient.auditRecord(topicId);
+    }
 }

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/result/TopicAuditRecordResultDTO.java

@@ -0,0 +1,33 @@
+package com.elink.esua.epdc.dto.group.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * 话题审核记录Result DTO
+ *
+ * @Author：liuchuang
+ * @Date：2019/11/8 9:25
+ */
+@Data
+public class TopicAuditRecordResultDTO implements Serializable {
+    private static final long serialVersionUID = 8330963966208262163L;
+
+    /**
+     * 状态（0：审核不通过，2：已关闭）
+     */
+    private Integer state;
+
+    /**
+     * 处理意见
+     */
+    private String processionOpinions;
+
+    /**
+     * 审核时间
+     */
+    private Date createdTime;
+}

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/result/TopicDetailResultDTO.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.topic.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -34,7 +35,7 @@ public class TopicDetailResultDTO implements Serializable {
     /**
      * 发布时间
      */
-    private String createdTime;
+    private Date createdTime;
 
     /**
      * 发布人

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/controller/AppTopicController.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.modules.topic.controller;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO;
@@ -10,6 +11,8 @@ import com.elink.esua.epdc.modules.topic.service.TopicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  *
  * 移动端-话题模块
@@ -66,4 +69,19 @@ public class AppTopicController {
     public Result close(@RequestBody TopicCloseFormDTO formDto) {
         return topicService.modifyTopicState(formDto, NumConstant.ZERO_STR);
     }
+
+    /**
+     *
+     * 话题审核记录
+     *
+     * @params [topicId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO>>
+     * @author liuchuang
+     * @since 2019/11/8 9:39
+     */
+    @GetMapping("auditRecord/{topicId}")
+    public Result<List<TopicAuditRecordResultDTO>> auditRecord(@PathVariable("topicId") String topicId) {
+        List<TopicAuditRecordResultDTO> data = topicService.listOfTopicAuditRecord(topicId);
+        return new Result<List<TopicAuditRecordResultDTO>>().ok(data);
+    }
 }

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/dao/TopicAuditRecordDao.java

@@ -18,9 +18,12 @@
 package com.elink.esua.epdc.modules.topic.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO;
 import com.elink.esua.epdc.modules.topic.entity.TopicAuditRecordEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 话题审核记录表 话题审核记录表
  *
@@ -29,5 +32,15 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface TopicAuditRecordDao extends BaseDao<TopicAuditRecordEntity> {
-	
+
+    /**
+     *
+     * 话题审核记录
+     *
+     * @params [topicId]
+     * @return java.util.List<com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO>
+     * @author liuchuang
+     * @since 2019/11/8 9:32
+     */
+    List<TopicAuditRecordResultDTO> selectListOfTopicAuditRecord(String topicId);
 }

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/TopicAuditRecordService.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.topic.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.group.result.TopicAuditRecordResultDTO;
 import com.elink.esua.epdc.dto.topic.TopicAuditRecordDTO;
 import com.elink.esua.epdc.modules.topic.entity.TopicAuditRecordEntity;
 
@@ -92,4 +93,15 @@ public interface TopicAuditRecordService extends BaseService<TopicAuditRecordEnt
      * @date 2019-11-07
      */
     void delete(String[] ids);
+
+    /**
+     *
+     * 话题审核记录
+     *
+     * @params [topicId]
+     * @return java.util.List<com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO>
+     * @author liuchuang
+     * @since 2019/11/8 9:35
+     */
+    List<TopicAuditRecordResultDTO> listOfTopicAuditRecord(String topicId);
 }

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/TopicService.java

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.topic.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.group.result.TopicAuditRecordResultDTO;
 import com.elink.esua.epdc.dto.topic.TopicDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO;
@@ -135,4 +136,15 @@ public interface TopicService extends BaseService<TopicEntity> {
      * @since 2019/11/7 16:50
      */
     Result modifyTopicState(TopicCloseFormDTO formDto, String operatorUser);
+
+    /**
+     *
+     * 话题审核记录
+     *
+     * @params [topicId]
+     * @return java.util.List<com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO>
+     * @author liuchuang
+     * @since 2019/11/8 9:35
+     */
+    List<TopicAuditRecordResultDTO> listOfTopicAuditRecord(String topicId);
 }

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicAuditRecordServiceImpl.java

@@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 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.dto.group.result.TopicAuditRecordResultDTO;
 import com.elink.esua.epdc.dto.topic.TopicAuditRecordDTO;
 import com.elink.esua.epdc.modules.topic.dao.TopicAuditRecordDao;
 import com.elink.esua.epdc.modules.topic.entity.TopicAuditRecordEntity;
@@ -97,4 +98,9 @@ public class TopicAuditRecordServiceImpl extends BaseServiceImpl<TopicAuditRecor
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public List<TopicAuditRecordResultDTO> listOfTopicAuditRecord(String topicId) {
+        return baseDao.selectListOfTopicAuditRecord(topicId);
+    }
+
 }

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java

@@ -33,6 +33,7 @@ import com.elink.esua.epdc.dto.enums.TopicStateEnum;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
 import com.elink.esua.epdc.dto.group.GroupDTO;
 import com.elink.esua.epdc.dto.group.UserGroupDTO;
+import com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO;
 import com.elink.esua.epdc.dto.topic.TopicDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO;
@@ -199,4 +200,9 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
         return new Result().error();
     }
 
+    @Override
+    public List<TopicAuditRecordResultDTO> listOfTopicAuditRecord(String topicId) {
+        return topicAuditRecordService.listOfTopicAuditRecord(topicId);
+    }
+
 }

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicAuditRecordDao.xml

@@ -3,18 +3,19 @@
 
 <mapper namespace="com.elink.esua.epdc.modules.topic.dao.TopicAuditRecordDao">
 
-    <resultMap type="com.elink.esua.epdc.entity.TopicAuditRecordEntity" id="topicAuditRecordMap">
+    <select id="selectListOfTopicAuditRecord" resultType="com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO">
-        <result property="id" column="ID"/>
+        SELECT
-        <result property="topicId" column="TOPIC_ID"/>
+            STATE,
-        <result property="state" column="STATE"/>
+            PROCESSING_OPINIONS,
-        <result property="processingOpinions" column="PROCESSING_OPINIONS"/>
+            CREATED_TIME
-        <result property="revision" column="REVISION"/>
+        FROM
-        <result property="createdBy" column="CREATED_BY"/>
+            epdc_topic_audit_record
-        <result property="createdTime" column="CREATED_TIME"/>
+        WHERE
-        <result property="updatedBy" column="UPDATED_BY"/>
+            DEL_FLAG = '0'
-        <result property="updatedTime" column="UPDATED_TIME"/>
+            AND TOPIC_ID = #{topicId}
-        <result property="delFlag" column="DEL_FLAG"/>
+        ORDER BY
-    </resultMap>
+            CREATED_TIME DESC
+    </select>
 
 
 </mapper>