新增：个人中心-我发表的话题列表，网格名称查询TODO

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/MyTopicsFormDTO.java

@@ -0,0 +1,14 @@
+package com.epmet.resi.group.dto.topic;
+
+import lombok.Data;
+
+@Data
+public class MyTopicsFormDTO {
+
+    private String customerId;
+
+    private Integer pageSize = 10;
+
+    private Integer pageNo = 1;
+
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/MyTopicsResultDTO.java

@@ -0,0 +1,14 @@
+package com.epmet.resi.group.dto.topic.result;
+
+import lombok.Data;
+
+@Data
+public class MyTopicsResultDTO {
+
+    private String topicId;
+    private Long releaseTime;
+    private String topicContent;
+    private String releaseGroupName;
+    private String releaseGridName;
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java

@@ -4,13 +4,12 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.VoteFormDTO;
 import com.epmet.modules.topic.service.ResiTopicService;
+import com.epmet.resi.group.dto.topic.MyTopicsFormDTO;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import com.epmet.resi.group.dto.topic.TopicInfoDTO;
 import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.result.*;
-import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -259,4 +258,19 @@ public class ResiTopicController {
         ValidatorUtils.validateEntity(formDTO);
         return new Result<CheckTopicPublisherResultDTO>().ok(topicService.checkTopicPublisher(formDTO));
     }
+
+    /**
+     * @Description 我创建的话题列表
+     * @return
+     * @author wxz
+     * @date 2020.11.10 14:58
+    */
+    @PostMapping("my-topics")
+    public Result listMyTopics(@RequestBody MyTopicsFormDTO formDTO, @LoginUser TokenDto tokenDto) {
+        ValidatorUtils.validateEntity(formDTO);
+        List<MyTopicsResultDTO> myTopics = topicService.listMyTopics(formDTO.getCustomerId(), tokenDto.getUserId(), formDTO.getPageNo(), formDTO.getPageSize());
+        return new Result().ok(myTopics);
+    }
+
+
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java

@@ -153,4 +153,5 @@ public interface ResiTopicDao extends BaseDao<ResiTopicEntity> {
      */
     CheckTopicPublisherResultDTO checkTopicPublisher(CheckTopicPublisherFormDTO formDTO);
 
+    List<MyTopicsResultDTO> listMyTopics(@Param("userId") String userId, @Param("customerId") String customerId);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java

@@ -264,4 +264,11 @@ public interface ResiTopicService extends BaseService<ResiTopicEntity> {
      */
     CheckTopicPublisherResultDTO checkTopicPublisher(CheckTopicPublisherFormDTO formDTO);
 
+    /**
+     * @Description 我发表的话题列表
+     * @return
+     * @author wxz
+     * @date 2020.11.10 15:03
+    */
+    List<MyTopicsResultDTO> listMyTopics(String customerId, String userId, Integer pageNo, Integer pageSize);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -1275,6 +1275,12 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         return resiTopicDao.checkTopicPublisher(formDTO);
     }
 
+    @Override
+    public List<MyTopicsResultDTO> listMyTopics(String customerId, String userId, Integer pageNo, Integer pageSize) {
+        List<MyTopicsResultDTO> myTopics = resiTopicDao.listMyTopics(userId, customerId);
+        // todo 查询网格名称，赋值
+        return myTopics;
+    }
 }
 
 

epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml

@@ -134,7 +134,7 @@
     </appender>
 
     <!-- 开发、测试环境 -->
-    <springProfile name="dev,test">
+    <springProfile name="local,dev,test">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.epmet.modules.comment.dao" level="DEBUG"/>

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml

@@ -446,5 +446,16 @@
             AND created_by = #{createdBy}
             AND id = #{topicId}
     </select>
+
+    <select id="listMyTopics" resultType="com.epmet.resi.group.dto.topic.result.MyTopicsResultDTO">
+        select t.id            as topicId,
+               t.topic_content as topicContent,
+               unix_timestamp(t.created_time) as releaseTime,
+               g.GROUP_NAME    as releaseGroupName
+        from resi_topic t
+                 inner join resi_group g on (t.GROUP_ID = g.ID and g.CUSTOMER_ID = #{customerId})
+        where t.CREATED_BY = #{userId}
+        order by t.CREATED_TIME desc
+    </select>
 </mapper>