diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java
new file mode 100644
index 000000000..aa9fe5c60
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemResultDTO.java
@@ -0,0 +1,88 @@
+package com.elink.esua.epdc.dto.item.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 项目列表DTO
+ * @Author yinzuomei
+ * @Date 2020/2/10 13:44
+ */
+@Data
+public class ItemResultDTO implements Serializable {
+ /**
+ * epdc_item表主键
+ */
+ private String id;
+
+ /**
+ * 议题内容-项目摘要
+ */
+ private String itemContent;
+
+ /**
+ * 父所有部门ID
+ */
+ private String parentDeptIds;
+
+ /**
+ * 父所有部门
+ */
+ private String parentDeptNames;
+
+ /**
+ * 所有部门ID
+ */
+ private String allDeptIds;
+
+ /**
+ * 所有部门
+ */
+ private String allDeptNames;
+
+ /**
+ * 网格
+ */
+ private String grid;
+
+ /**
+ * 网格ID
+ */
+ private Long gridId;
+
+ /**
+ * 发布人用户昵称
+ */
+ private String nickName;
+ /**
+ * 发布时间
+ */
+ private Date releaseTime;
+
+ /**
+ * 支持-点赞次数
+ */
+ private Integer approveNum;
+
+ /**
+ * 反对-踩次数
+ */
+ private Integer opposeNum;
+
+ /**
+ * 评论数
+ */
+ private Integer commentNum;
+
+ /**
+ * 浏览数
+ */
+ private Integer browseNum;
+
+ /**
+ * 表达态度(评论+回复+浏览)
+ */
+ private Integer expressAttitudeNum;
+}
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/result/TopicResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/TopicResultDTO.java
similarity index 93%
rename from esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/result/TopicResultDTO.java
rename to esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/TopicResultDTO.java
index 403e69207..270dcb88a 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/result/TopicResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/TopicResultDTO.java
@@ -1,4 +1,4 @@
-package com.elink.esua.epdc.dto.result;
+package com.elink.esua.epdc.dto.topic.result;
import lombok.Data;
@@ -6,7 +6,7 @@ import java.io.Serializable;
import java.util.Date;
/**
- * @Description 最热话题列表DTO
+ * @Description 话题列表DTO
* @Author yinzuomei
* @Date 2020/2/10 11:31
*/
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java
new file mode 100644
index 000000000..d0e230492
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.modules.item.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
+import com.elink.esua.epdc.modules.item.service.ItemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+
+/**
+ * 项目表 项目表
+ *
+ * @author yujintao yujintao@elink-cn.com
+ * @since v1.0.0 2019-09-04
+ */
+@RestController
+@RequestMapping("item")
+public class ItemController {
+
+ @Autowired
+ private ItemService itemService;
+
+ /**
+ * @param params
+ * @return com.elink.esua.epdc.dto.item.result.ItemResultDTO
+ * @Author yinzuomei
+ * @Description 最热项目列表查询
+ * @Date 2020/2/10 13:45
+ **/
+ @GetMapping("pageHottestItem")
+ public Result> pageHottestItem(@RequestParam Map params) {
+ PageData page = itemService.listItemResultDTO(params);
+ return new Result>().ok(page);
+ }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
new file mode 100644
index 000000000..81319ce3e
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
@@ -0,0 +1,42 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.modules.item.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description 项目模块
+ * @Author yinzuomei
+ * @Date 2020/2/10 13:43
+ */
+@Mapper
+public interface ItemDao extends BaseDao {
+ /**
+ * @param params
+ * @return java.util.List
+ * @Author yinzuomei
+ * @Description 最热项目列表查询
+ * @Date 2020/2/10 13:53
+ **/
+ List selectListHottestItemResultDTO(Map params);
+}
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
new file mode 100644
index 000000000..eedbbc6ba
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
@@ -0,0 +1,24 @@
+package com.elink.esua.epdc.modules.item.service;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
+
+import java.util.Map;
+
+/**
+ * 项目模块
+ *
+ * @Author yinzuomei
+ * @Date 2020/2/10 13:43
+ */
+public interface ItemService {
+
+ /**
+ * @param params
+ * @return com.elink.esua.epdc.dto.item.result.ItemResultDTO
+ * @Author yinzuomei
+ * @Description 最热项目列表查询
+ * @Date 2020/2/10 13:46
+ **/
+ PageData listItemResultDTO(Map params);
+}
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
new file mode 100644
index 000000000..26360c7f5
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
@@ -0,0 +1,37 @@
+package com.elink.esua.epdc.modules.item.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.datasources.DataSourceNames;
+import com.elink.esua.epdc.datasources.annotation.DataSource;
+import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
+import com.elink.esua.epdc.modules.item.dao.ItemDao;
+import com.elink.esua.epdc.modules.item.service.ItemService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description 项目模块
+ * @Author yinzuomei
+ * @Date 2020/2/10 13:43
+ */
+@Service
+public class ItemServiceImpl extends BaseServiceImpl implements ItemService {
+ /**
+ * @param params
+ * @return com.elink.esua.epdc.dto.item.result.ItemResultDTO
+ * @Author yinzuomei
+ * @Description 最热项目列表查询
+ * @Date 2020/2/10 13:47
+ **/
+ @DataSource(name = DataSourceNames.FOURTH)
+ @Override
+ public PageData listItemResultDTO(Map params) {
+ IPage page = getPage(params);
+ List list = baseDao.selectListHottestItemResultDTO(params);
+ return new PageData<>(list, page.getTotal());
+ }
+}
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/controller/TopicController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/controller/TopicController.java
index bd460ce39..d9daf3a74 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/controller/TopicController.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/controller/TopicController.java
@@ -19,7 +19,7 @@ package com.elink.esua.epdc.modules.topic.controller;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.result.TopicResultDTO;
+import com.elink.esua.epdc.dto.topic.result.TopicResultDTO;
import com.elink.esua.epdc.modules.topic.service.TopicService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/dao/TopicDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/dao/TopicDao.java
index 82e91535b..68c546c45 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/dao/TopicDao.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/dao/TopicDao.java
@@ -18,7 +18,7 @@
package com.elink.esua.epdc.modules.topic.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.elink.esua.epdc.dto.result.TopicResultDTO;
+import com.elink.esua.epdc.dto.topic.result.TopicResultDTO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/TopicService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/TopicService.java
index 1743f20e3..862c76d08 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/TopicService.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/TopicService.java
@@ -18,7 +18,7 @@
package com.elink.esua.epdc.modules.topic.service;
import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.dto.result.TopicResultDTO;
+import com.elink.esua.epdc.dto.topic.result.TopicResultDTO;
import java.util.Map;
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicServiceImpl.java
index 552826f03..fc53e5d42 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicServiceImpl.java
@@ -5,10 +5,9 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.datasources.DataSourceNames;
import com.elink.esua.epdc.datasources.annotation.DataSource;
-import com.elink.esua.epdc.dto.result.TopicResultDTO;
+import com.elink.esua.epdc.dto.topic.result.TopicResultDTO;
import com.elink.esua.epdc.modules.topic.dao.TopicDao;
import com.elink.esua.epdc.modules.topic.service.TopicService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -21,8 +20,6 @@ import java.util.Map;
*/
@Service
public class TopicServiceImpl extends BaseServiceImpl implements TopicService {
- @Autowired
- private TopicDao topicDao;
/**
* @param params
@@ -36,7 +33,7 @@ public class TopicServiceImpl extends BaseServiceImpl
public PageData listHottestTopic(Map params) {
IPage page = getPage(params);
- List list = topicDao.selectListHottestTopicDTO(params);
+ List list = baseDao.selectListHottestTopicDTO(params);
return new PageData<>(list, page.getTotal());
}
@@ -51,7 +48,7 @@ public class TopicServiceImpl extends BaseServiceImpl
@Override
public PageData listLatestTopic(Map params) {
IPage page = getPage(params);
- List list = topicDao.selectListLatesttTopicDTO(params);
+ List list = baseDao.selectListLatesttTopicDTO(params);
return new PageData<>(list, page.getTotal());
}
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemDao.xml
new file mode 100644
index 000000000..4cba6a36c
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemDao.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+ SELECT
+ ei.id,
+ ei.ITEM_CONTENT,
+ ei.PARENT_DEPT_IDS,
+ ei.PARENT_DEPT_NAMES,
+ ei.ALL_DEPT_IDS,
+ ei.ALL_DEPT_NAMES,
+ ei.GRID_ID,
+ ei.GRID,
+ ei.NICK_NAME,
+ ei.CREATED_TIME AS releaseTime,
+ ee.APPROVE_NUM,
+ ee.OPPOSE_NUM,
+ ee.COMMENT_NUM,
+ ee.BROWSE_NUM,
+ (ee.APPROVE_NUM + ee.OPPOSE_NUM + ee.COMMENT_NUM + ee.BROWSE_NUM ) AS expressAttitudeNum
+ FROM
+ epdc_item ei
+ LEFT JOIN epdc_events ee ON ( ei.EVENT_ID = ee.ID )
+ WHERE
+ ei.DEL_FLAG = '0'
+ AND ee.DEL_FLAG = '0'
+
+ AND ei.ITEM_CONTENT LIKE CONCAT('%',#{searchContent},'%')
+
+
+ AND (find_in_set(#{streetId},ei.PARENT_DEPT_IDS)
+ OR find_in_set(#{streetId},ei.ALL_DEPT_IDS))
+
+
+ AND (find_in_set(#{communityId},ei.PARENT_DEPT_IDS)
+ OR find_in_set(#{communityId},ei.ALL_DEPT_IDS))
+
+
+ AND (ei.GRID_ID = #{gridId}
+ OR find_in_set(#{gridId},ei.ALL_DEPT_IDS))
+
+
+ and DATE_FORMAT( ei.CREATED_TIME, '%Y-%m-%d' ) >=#{startTime}
+
+
+ and DATE_FORMAT( ei.CREATED_TIME, '%Y-%m-%d' ) <=#{endTime}
+
+ ORDER BY expressAttitudeNum DESC
+
+
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/topic/TopicDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/topic/TopicDao.xml
index 4bcecb528..4984cae3a 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/topic/TopicDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/topic/TopicDao.xml
@@ -3,7 +3,7 @@
-
+
select
et.ID,
et.TOPIC_CONTENT,
@@ -46,7 +46,7 @@
-
+
select
et.ID,
et.TOPIC_CONTENT,