Merge remote-tracking branch 'origin/dev_analysis' into dev_analysis

# Conflicts:
#	esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java
#	esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java
#	esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java
#	esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java
#	esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml

esua-epdc/epdc-gateway/src/main/resources/application.yml

@@ -231,6 +231,7 @@ renren:
     - /api/work/*/swagger/**
   workUrls:
     - /api/work/** #工作端接口
+    - /api/analysis/** #数据端接口
 
 
 epdc:
@@ -250,3 +251,4 @@ epdc:
     - /api/app-user/user/ma/gridLeaderRegister # 小程序用户 网格长注册
     - /api/app-user/user/ma/v2/getToken # 小程序用户 注册或登录(版本v2)
     - /api/work/** #工作端接口不拦截
+    - /api/analysis/** #数据端接口不拦截

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAnalysisFormDTO.java

@@ -0,0 +1,60 @@
+package com.elink.esua.epdc.dto.item.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.List;
+
+/**
+ * @Description 疑难项目分析DTO
+ * @Author zy
+ * @Date 2020/2/11
+ */
+@Data
+public class ItemAnalysisFormDTO implements Serializable {
+    private static final long serialVersionUID = 6144783947444092507L;
+
+    /**
+     * 页码
+     */
+    @Min(value = 1, message = "页码必须大于0")
+    private Integer pageIndex;
+
+    /**
+     * 页容量，默认5页
+     */
+    @Min(value = 1, message = "每页条数必须大于0")
+    private Integer pageSize;
+
+    /**
+     * 第一页查询发起时的时间
+     */
+    @NotBlank(message = "时间戳不能为空")
+    private String timestamp;
+
+    /**
+     * 分析类型（1:耗时最长，2:设计部门最多，3:处理次数最多）
+     */
+    @NotNull(message = "分析类型不能为空")
+    private Integer analysisType;
+
+    /**
+     * 项目状态（1:结案或关闭，2:解决中）
+     */
+    @NotNull(message = "项目状态不能为空")
+    private Integer itemState;
+
+    /**
+     * 数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年）
+     */
+    @NotNull(message = "数据时间类型不能为空")
+    private Integer someMonthsType;
+
+    /**
+     * 部门ID列表
+     */
+    List<Long> deptIdList;
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemSurveyFormDTO.java

@@ -0,0 +1,33 @@
+package com.elink.esua.epdc.dto.item.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 重点项目概况DTO
+ * @Author zy
+ * @Date 2020/2/11
+ */
+@Data
+public class ItemSurveyFormDTO implements Serializable {
+    private static final long serialVersionUID = 6544783947444092507L;
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 第一页查询发起时的时间
+     */
+    @NotBlank(message = "时间戳不能为空")
+    private String timestamp;
+
+    /**
+     * 部门ID列表
+     */
+    List<Long> gridIds;
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAnalysisResultDTO.java

@@ -0,0 +1,65 @@
+package com.elink.esua.epdc.dto.item.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 疑难项目分析DTO
+ * @Author zy
+ * @Date 2020/2/11
+ */
+@Data
+public class ItemAnalysisResultDTO implements Serializable {
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 项目内容
+     */
+    private String content;
+
+    /**
+     * 创建时间
+     */
+    private String createdTime;
+
+    /**
+     * 图片
+     */
+    private List<String> images;
+
+    /**
+     * 项目状态 0-处理中，5-已关闭，10-已结案
+     */
+    private Integer itemState;
+
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 耗时（小时）
+     */
+    private Integer spendTime;
+
+    /**
+     * 部门数量
+     */
+    private Integer deptCount;
+
+    /**
+     * 处理次数
+     */
+    private Integer handleCount;
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemSurveyResultDTO.java

@@ -0,0 +1,53 @@
+package com.elink.esua.epdc.dto.item.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 重点项目概况DTO
+ * @Author zy
+ * @Date 2020/2/11
+ */
+@Data
+public class ItemSurveyResultDTO implements Serializable {
+//    t1.unsolvedCount, -- notCloseNum
+//    t2.dispatchCount, -- reportGridPlatformNum
+//    t2.solvingCount, -- solvingNum
+//    t2.solvedCount   -- solvedNum
+
+    /**
+     * 未解决项目数
+     */
+    private Integer unsolvedCount;
+
+    /**
+     * 超时项目数
+     */
+    private Integer timeoutCount;
+
+    /**
+     * 未超时项目数
+     */
+    private Integer noTimeoutCount;
+
+    /**
+     * 区调度项目数
+     */
+    private Integer dispatchCount;
+
+    /**
+     * 解决中项目数
+     */
+    private Integer solvingCount;
+
+    /**
+     * 已解决项目数
+     */
+    private Integer solvedCount;
+
+    /**
+     * 更新时间
+     */
+    private String updateTime;
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/NewHotTopicFormDTO.java

@@ -0,0 +1,41 @@
+package com.elink.esua.epdc.dto.topic.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 最新发布话题接口入参DTO
+ * @Author wgf
+ * @Date 2020/2/11 10:31
+ */
+@Data
+public class NewHotTopicFormDTO implements Serializable {
+	private static final long serialVersionUID = -1938141144074477454L;
+
+	/**
+	 * 页码，从1开始
+	 */
+	@Min(value = 1, message = "页码必须大于0")
+	private int pageIndex;
+
+	/**
+	 * 页容量，默认10页
+	 */
+	@Min(value = 1, message = "每页条数必须大于必须大于0")
+	private int pageSize = 10;
+
+	/**
+	 * 第一页查询发起时的时间
+	 */
+	@NotBlank(message = "时间戳不能为空")
+	private String timestamp;
+
+	/**
+     * 数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年）,默认1
+	 */
+	@NotBlank(message = "数据时间类型不能为空")
+	private int someMonthsType = 1;
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/NewHotTopicResultDTO.java

@@ -0,0 +1,43 @@
+package com.elink.esua.epdc.dto.topic.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 话题列表DTO
+ * @Author yinzuomei
+ * @Date 2020/2/10 11:31
+ */
+@Data
+public class NewHotTopicResultDTO implements Serializable {
+	private static final long serialVersionUID = -1938141144074477454L;
+
+	/**
+	 * 话题Id（TopicId）
+	 */
+	private String id;
+
+	/**
+	 * 内容
+	 */
+	private String content;
+
+	/**
+	 * 图片
+	 */
+	private List<String> images;
+
+	/**
+	 * 部门名称
+	 */
+	private String deptName;
+
+	/**
+	 * 创建时间
+	 */
+	private String createdTime;
+
+
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserDataRankResultDTO.java

@@ -0,0 +1,64 @@
+package com.elink.esua.epdc.dto.user.result;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 用户数据排行
+ *
+ * @author work@yujt.net.cn
+ * @date 2020/2/11 14:44
+ */
+@Data
+public class UserDataRankResultDTO {
+
+    /**
+     * 街道id
+     */
+    private String streetId;
+    /**
+     * 街道名称
+     */
+    private String streetName;
+    /**
+     * 用户注册数
+     */
+    private Integer userCount;
+    /**
+     * 男性数
+     */
+    private Integer maleCount;
+    /**
+     * 女性数
+     */
+    private Integer femaleCount;
+    /**
+     * 未知性别数
+     */
+    private Integer unknownSexCount;
+    /**
+     * 居民数
+     */
+    private Integer residentCount;
+    /**
+     * 党员数
+     */
+    private Integer partymemberCount;
+    /**
+     * 老人数（年龄大于50）
+     */
+    private Integer oldCount;
+    /**
+     * 年轻人数（年龄不大于50）
+     */
+    private Integer youngCount;
+    /**
+     * 老人比例
+     */
+    private BigDecimal oldPercent;
+    /**
+     * 年轻人比例
+     */
+    private BigDecimal youngPercent;
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/AppItemAnalysisController.java

@@ -0,0 +1,40 @@
+package com.elink.esua.epdc.modules.item.controller;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.item.form.ItemAnalysisFormDTO;
+import com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO;
+import com.elink.esua.epdc.modules.item.service.ItemAnalysisService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 手机端领导数据-项目
+ *
+ * @author zy
+ * @since 2020-2-11
+ */
+@RestController
+@RequestMapping("appitem")
+public class AppItemAnalysisController {
+
+    @Autowired
+    private ItemAnalysisService itemAnalysisService;
+
+    /** 
+     * @Description: 疑难项目分析 
+     * @Param: [formDto] 
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO>> 
+     * @Author: zy 
+     * @Date: 2020-02-11 
+     */ 
+    @GetMapping("getItemAnalysis")
+    public Result<List<ItemAnalysisResultDTO>> getItemAnalysis(@RequestBody ItemAnalysisFormDTO formDto) {
+        List<ItemAnalysisResultDTO> data = itemAnalysisService.getItemAnalysis(formDto);
+        return new Result<List<ItemAnalysisResultDTO>>().ok(data);
+    }
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java

@@ -20,12 +20,14 @@ 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.*;
+import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO;
+import com.elink.esua.epdc.dto.item.result.DifficultItemResultDTO;
+import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
+import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO;
+import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO;
 import com.elink.esua.epdc.modules.item.service.ItemAnalysisService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-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;
 
@@ -107,4 +109,16 @@ public class ItemAnalysisController {
 		PageData<ReportSolvedItemResultDTO> page = itemAnalysisService.listReportSolvedItemResultDTO(params);
 		return new Result<PageData<ReportSolvedItemResultDTO>>().ok(page);
 	}
+	/**
+	 * @Description: 重点项目概况
+	 * @Param: [formDto]
+	 * @return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO>
+	 * @Author: zy
+	 * @Date: 2020-02-11
+	 */
+	@GetMapping("getItemSurvey")
+	public Result<ItemSurveyResultDTO> getItemSurvey(@RequestBody ItemSurveyFormDTO formDTO) {
+		ItemSurveyResultDTO data = itemAnalysisService.getItemSurvey(formDTO);
+		return new Result<ItemSurveyResultDTO>().ok(data);
+	}
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java

@@ -75,4 +75,22 @@ public interface ItemAnalysisDao extends BaseDao<ItemResultDTO> {
 	 * @Date 2020/2/11 15:15
 	 **/
 	List<ReportSolvedItemResultDTO> selectListReportSolvedItemResultDTO(Map<String, Object> params);
+
+	/**
+	 * @Description: 重点项目概况
+	 * @Param: [formDTO]
+	 * @return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO>
+	 * @Author: zy
+	 * @Date: 2020-02-11
+	*/
+	ItemSurveyResultDTO selectOneItemSurvey(ItemSurveyFormDTO formDTO);
+
+	/**
+	 * @Description: 疑难项目分析
+	 * @Param: [formDto]
+	 * @return: java.util.List<com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO>
+	 * @Author: zy
+	 * @Date: 2020-02-11
+	 */
+	List<ItemAnalysisResultDTO> selectOneItemAnalysis(ItemAnalysisFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java

@@ -2,7 +2,11 @@ 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.*;
+import com.elink.esua.epdc.dto.item.form.ItemAnalysisFormDTO;
+import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO;
+import com.elink.esua.epdc.dto.item.result.*;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -57,4 +61,22 @@ public interface ItemAnalysisService {
 	 * @Date 2020/2/11 15:13
 	 **/
 	PageData<ReportSolvedItemResultDTO> listReportSolvedItemResultDTO(Map<String, Object> params);
+
+	/**
+	 * @Description: 重点项目概况
+	 * @Param: [formDTO]
+	 * @return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO>
+	 * @Author: zy
+	 * @Date: 2020-02-11
+	 */
+	ItemSurveyResultDTO getItemSurvey(ItemSurveyFormDTO formDTO);
+
+	/**
+	 * @Description: 疑难项目分析
+	 * @Param: [formDto]
+	 * @return: java.util.List<com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO>
+	 * @Author: zy
+	 * @Date: 2020-02-11
+	 */
+	List<ItemAnalysisResultDTO> getItemAnalysis(ItemAnalysisFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java

@@ -8,6 +8,9 @@ import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.datasources.DataSourceNames;
 import com.elink.esua.epdc.datasources.annotation.DataSource;
 import com.elink.esua.epdc.dto.item.result.*;
+import com.elink.esua.epdc.dto.item.form.ItemAnalysisFormDTO;
+import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO;
+import com.elink.esua.epdc.dto.item.result.*;
 import com.elink.esua.epdc.modules.item.dao.ItemAnalysisDao;
 import com.elink.esua.epdc.modules.item.service.ItemAnalysisService;
 import org.slf4j.Logger;
@@ -125,4 +128,14 @@ public class ItemAnalysisServiceImpl extends BaseServiceImpl<ItemAnalysisDao, It
 		List<ReportSolvedItemResultDTO> list = baseDao.selectListReportSolvedItemResultDTO(params);
 		return new PageData<>(list, page.getTotal());
 	}
+
+	@Override
+	public ItemSurveyResultDTO getItemSurvey(ItemSurveyFormDTO formDTO) {
+		return baseDao.selectOneItemSurvey(formDTO);
+	}
+
+	@Override
+	public List<ItemAnalysisResultDTO> getItemAnalysis(ItemAnalysisFormDTO formDto) {
+		return baseDao.selectOneItemAnalysis(formDto);
+	}
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/controller/AppTopicAnalysisController.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.topic.controller;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.topic.form.HotTopicFormDTO;
+import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO;
 import com.elink.esua.epdc.modules.topic.service.TopicAnalysisService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -53,4 +54,17 @@ public class AppTopicAnalysisController {
 		return result;
 	}
 
+	/**
+	 * @param newHotTopicFormDTO
+	 * @return com.elink.esua.epdc.dto.result.TopicResultDTO
+	 * @Author wanggongfeng
+	 * @Description 最新发布话题接口
+	 * @Date 2020/2/11 11:12
+	 **/
+	@GetMapping("getNewTopicList")
+	public Result getNewTopicList(@RequestBody NewHotTopicFormDTO newHotTopicFormDTO) {
+		Result result = topicAnalysisService.getNewTopicList(newHotTopicFormDTO);
+		return result;
+	}
+
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/dao/TopicAnalysisDao.java

@@ -19,9 +19,12 @@ package com.elink.esua.epdc.modules.topic.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.elink.esua.epdc.dto.topic.form.HotTopicFormDTO;
+import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO;
 import com.elink.esua.epdc.dto.topic.result.HotTopicResultDTO;
+import com.elink.esua.epdc.dto.topic.result.NewHotTopicResultDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicResultDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -58,5 +61,12 @@ public interface TopicAnalysisDao extends BaseMapper<TopicResultDTO> {
 	 * @param hotTopicFormDTO
 	 * @return
 	 */
-	List<HotTopicResultDTO> getHotTopicList(HotTopicFormDTO hotTopicFormDTO,List deptIdList);
+	List<HotTopicResultDTO> selectHotTopicList(@Param("hotTopicFormDTO")HotTopicFormDTO hotTopicFormDTO,@Param("deptIdList")List<Long> deptIdList);
+
+	/**
+	 * 最新发布话题接口
+	 * @param newHotTopicFormDTO
+	 * @return
+	 */
+	List<NewHotTopicResultDTO> selectNewHotTopicList(@Param("newHotTopicFormDTO")NewHotTopicFormDTO newHotTopicFormDTO, @Param("deptIdList")List<Long> deptIdList);
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/TopicAnalysisService.java

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.topic.service;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.topic.form.HotTopicFormDTO;
+import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicResultDTO;
 
 import java.util.Map;
@@ -55,4 +56,11 @@ public interface TopicAnalysisService {
 	 * @return
 	 */
 	Result getHotTopicList(HotTopicFormDTO hotTopicFormDTO);
+
+	/**
+	 * 最新发布话题接口
+	 * @param newHotTopicFormDTO
+	 * @return
+	 */
+	Result getNewTopicList(NewHotTopicFormDTO newHotTopicFormDTO);
 }

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

@@ -9,7 +9,9 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.datasources.DataSourceNames;
 import com.elink.esua.epdc.datasources.annotation.DataSource;
 import com.elink.esua.epdc.dto.topic.form.HotTopicFormDTO;
+import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO;
 import com.elink.esua.epdc.dto.topic.result.HotTopicResultDTO;
+import com.elink.esua.epdc.dto.topic.result.NewHotTopicResultDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicResultDTO;
 import com.elink.esua.epdc.modules.topic.dao.TopicAnalysisDao;
 import com.elink.esua.epdc.modules.topic.service.TopicAnalysisService;
@@ -66,9 +68,33 @@ public class TopicAnalysisServiceImpl extends BaseServiceImpl<TopicAnalysisDao,
 		return new PageData<>(list, page.getTotal());
 	}
 
+	/**
+	 * 最热话题接口
+	 * @param hotTopicFormDTO
+	 * @Author wanggongfeng
+	 * @return
+	 */
 	@Override
 	public Result getHotTopicList(HotTopicFormDTO hotTopicFormDTO){
-		List<HotTopicResultDTO> list = baseDao.getHotTopicList(hotTopicFormDTO,SecurityUser.getUser().getDeptIdList());
+		List<HotTopicResultDTO> list = baseDao.selectHotTopicList(hotTopicFormDTO,SecurityUser.getUser().getDeptIdList());
+		return new Result().ok(list);
+	}
+
+	/**
+	 * 最新发布话题接口
+	 * @param newHotTopicFormDTO
+	 * @Author wanggongfeng
+	 * @return
+	 */
+	@Override
+	public Result getNewTopicList(NewHotTopicFormDTO newHotTopicFormDTO){
+		//List<Long> aaa = SecurityUser.getUser().getDeptIdList();
+		/*Long long1 = 1169158285790900226L;
+		Long long2 = 1169158285790900226L;
+		List<Long> list2 = new ArrayList<Long>();
+		list2.add(long1);
+		list2.add(long2);*/
+		List<NewHotTopicResultDTO> list = baseDao.selectNewHotTopicList(newHotTopicFormDTO,SecurityUser.getUser().getDeptIdList());
 		return new Result().ok(list);
 	}
 

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java

@@ -1,7 +1,13 @@
 package com.elink.esua.epdc.modules.user.controller;
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.elink.esua.epdc.commons.tools.page.PageData;
-import org.springframework.web.bind.annotation.RestController;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO;
+import com.elink.esua.epdc.modules.user.service.UserAnalysisService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
 
 /**
  * 数据端，用户数据分析相关接口
@@ -13,4 +19,21 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("user")
 public class UserAnalysisController {
 
+
+    @Autowired
+    private UserAnalysisService userAnalysisService;
+
+    /**
+     * PC端用户数据分析，用户注册排行，党员排行
+     *
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO>>
+     * @author work@yujt.net.cn
+     * @date 2020/2/11 15:17
+     */
+    @GetMapping("page/dataRank")
+    public Result<PageData<UserDataRankResultDTO>> pageUserDataRank(@RequestParam Map<String, Object> params) {
+        PageData<UserDataRankResultDTO> pageData = userAnalysisService.pageUserDataRank(params);
+        return new Result().ok(pageData);
+    }
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java

@@ -3,9 +3,11 @@ package com.elink.esua.epdc.modules.user.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.elink.esua.epdc.dto.user.UserAnalysisDTO;
 import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO;
+import com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户数据分析相关
@@ -82,4 +84,13 @@ public interface UserAnalysisDao extends BaseMapper<UserAnalysisDTO> {
      */
     List<GridOpeningResultDTO> selectListItemCount();
 
+    /**
+     * 查询用户数据排行
+     *
+     * @param params
+     * @return java.util.List<com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO>
+     * @author work@yujt.net.cn
+     * @date 2020/2/11 14:48
+     */
+    List<UserDataRankResultDTO> selectListUserDataRank(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java

@@ -1,8 +1,11 @@
 package com.elink.esua.epdc.modules.user.service;
 
+import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO;
+import com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户数据分析相关业务
@@ -20,4 +23,14 @@ public interface UserAnalysisService {
      * @date 2020/2/11 14:04
      */
     List<GridOpeningResultDTO> listPageGridOpening();
+
+    /**
+     * 用户数据排行，PC端用户数据分析，居民注册排行，党员排行
+     *
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO>
+     * @author work@yujt.net.cn
+     * @date 2020/2/11 15:13
+     */
+    PageData<UserDataRankResultDTO> pageUserDataRank(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java

@@ -1,15 +1,22 @@
 package com.elink.esua.epdc.modules.user.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.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
+import com.elink.esua.epdc.datasources.DataSourceNames;
+import com.elink.esua.epdc.datasources.annotation.DataSource;
 import com.elink.esua.epdc.dto.user.UserAnalysisDTO;
 import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO;
-import com.elink.esua.epdc.dto.user.result.UserRegisterDataResultDTO;
+import com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO;
 import com.elink.esua.epdc.modules.user.dao.UserAnalysisDao;
 import com.elink.esua.epdc.modules.user.service.UserAnalysisService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户数据分析业务实现
@@ -29,4 +36,14 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
 
         return baseDao.selectListReigistCount();
     }
+
+    @Override
+    @DataSource(name = DataSourceNames.ELEVENTH)
+    public PageData<UserDataRankResultDTO> pageUserDataRank(Map<String, Object> params) {
+        UserDetail userDetail = SecurityUser.getUser();
+        params.put("deptIdList", userDetail.getDeptIdList());
+        IPage<UserDataRankResultDTO> page = getPage(params);
+        List<UserDataRankResultDTO> list = baseDao.selectListUserDataRank(params);
+        return new PageData<>(list, page.getTotal());
+    }
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml

@@ -333,4 +333,140 @@
             )
         </if>
     </select>
+
+    <select id="selectOneItemSurvey" resultType="com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO">
+        SELECT
+        t1.unsolvedCount,
+        t2.dispatchCount,
+        t2.solvingCount,
+        t2.solvedCount
+        FROM
+        (
+        SELECT
+        COUNT( ei.ID ) AS unsolvedCount
+        FROM
+        esua_epdc_events.epdc_item ei
+        LEFT JOIN esua_epdc_events.epdc_item_dept eid ON eid.ITEM_ID = ei.ID
+        AND eid.DEL_FLAG = '0'
+        WHERE
+        ei.ITEM_STATE = 0
+        AND ei.DEL_FLAG = '0'
+        <if test="gridIds!=null and gridIds.size()>0">
+            and eid.DEPT_ID in
+            <foreach collection="gridIds" index="index" item="deptId" open="(" separator="," close=")">
+                #{deptId}
+            </foreach>
+        </if>
+        ) t1,
+        (
+        SELECT
+        COUNT( DISTINCT eihp.ITEM_ID ) AS dispatchCount,
+        COUNT( DISTINCT ei1.ID ) AS solvingCount,
+        COUNT( DISTINCT ei2.ID ) AS solvedCount
+        FROM
+        esua_epdc_events.epdc_item_handle_process eihp
+        LEFT JOIN esua_epdc_events.epdc_item ei1 ON eihp.ITEM_ID = ei1.ID
+        AND ei1.DEL_FLAG = 0
+        AND ei1.ITEM_STATE = 0
+        LEFT JOIN esua_epdc_events.epdc_item ei2 ON eihp.ITEM_ID = ei2.ID
+        AND ei2.DEL_FLAG = 0
+        AND ( ei2.ITEM_STATE = 5 OR ei2.ITEM_STATE = 10 )
+        LEFT JOIN esua_epdc_events.epdc_item_dept eid ON eid.ITEM_ID = eihp.ITEM_ID
+        AND eid.DEL_FLAG = '0'
+        WHERE
+        eihp.STATE = 15
+        AND eihp.DEL_FLAG = '0'
+        <if test="gridIds!=null and gridIds.size()>0">
+            and eid.DEPT_ID in
+            <foreach collection="gridIds" index="index" item="deptId" open="(" separator="," close=")">
+                #{deptId}
+            </foreach>
+        </if>
+        ) t2;
+    </select>
+
+    <!--疑难项目分析-->
+    <resultMap id="itemAnalysisListMap" type="com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO">
+        <result property="id" column="ID"/>
+        <result property="content" column="content"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="handleCount" column="handleCount"/>
+        <result property="deptCount" column="deptCount"/>
+        <result property="itemState" column="ITEM_STATE"/>
+        <result property="spendTime" column="spendTime"/>
+        <result property="deptName" column="deptName"/>
+        <result property="categoryName" column="categoryName"/>
+        <collection property="images" ofType="java.lang.String">
+            <result property="image" column="IMG_URL"/>
+        </collection>
+    </resultMap>
+
+    <select id="selectOneItemAnalysis" resultMap="itemAnalysisListMap">
+        SELECT
+            t.ID,
+            t.content,
+            t.CREATED_TIME,
+            t.handleCount,
+            t.deptCount,
+            t.ITEM_STATE,
+            t.spendTime,
+            t.deptName,
+            t.categoryName,
+            eimg.IMG_URL
+            FROM (
+            SELECT
+            ei.ID,
+            ei.EVENT_ID,
+            ei.ITEM_CONTENT AS content,
+            ei.CREATED_TIME,
+            ( SELECT COUNT( eihp.ID ) FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND eihp.ITEM_ID = ei.ID ) AS handleCount,
+            ( SELECT COUNT(eid.ID) FROM esua_epdc_events.epdc_item_dept eid WHERE eid.DEL_FLAG = '0' AND eid.ITEM_ID = ei.ID ) AS deptCount,
+            ei.ITEM_STATE,
+            ( SELECT TIMESTAMPDIFF( HOUR, MIN(eihp.CREATED_TIME), MAX(eihp.CREATED_TIME) ) FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND eihp.ITEM_ID = ei.ID ) AS spendTime,
+            ei.ALL_DEPT_NAMES AS deptName,
+            ei.CATEGORY_FULL_NAME AS categoryName
+            FROM
+            esua_epdc_events.epdc_item ei
+            WHERE
+            ei.DEL_FLAG = '0'
+            AND ei.GRID_ID IN
+            <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
+                #{deptId}
+            </foreach>
+            <if test="someMonthsType == 1">
+                <![CDATA[ AND DATE_SUB(CURDATE( ), INTERVAL 1 MONTH) <= ]]> ei.CREATED_TIME
+            </if>
+            <if test="someMonthsType == 2">
+                <![CDATA[ AND DATE_SUB(CURDATE( ), INTERVAL 3 MONTH) <= ]]> ei.CREATED_TIME
+            </if>
+            <if test="someMonthsType == 3">
+                <![CDATA[ AND DATE_SUB(CURDATE( ), INTERVAL 6 MONTH) <= ]]> ei.CREATED_TIME
+            </if>
+            <if test="someMonthsType == 4">
+                <![CDATA[ AND DATE_SUB(CURDATE( ), INTERVAL 1 YEAR) <= ]]> ei.CREATED_TIME
+            </if>
+            <if test="timestamp != null and timestamp != ''">
+                <![CDATA[ AND DATE_FORMAT(ei.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
+            </if>
+            <if test="itemState == 1">
+                AND ei.ITEM_STATE IN (5, 10)
+            </if>
+            <if test="itemState == 2">
+                AND ei.ITEM_STATE = 0
+            </if>
+            ORDER BY
+            <if test="analysisType == 1">
+                spendTime DESC,
+            </if>
+            <if test="analysisType == 2">
+                deptCount DESC,
+            </if>
+            <if test="analysisType == 3">
+                handleCount DESC,
+            </if>
+            CREATED_TIME DESC
+            LIMIT #{pageIndex}, #{pageSize}) t
+            LEFT JOIN esua_epdc_events.epdc_img eimg ON eimg.REFERENCE_ID = t.EVENT_ID
+            AND eimg.DEL_FLAG = '0';
+    </select>
 </mapper>

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/topic/TopicAnalysisDao.xml

@@ -89,7 +89,7 @@
     </select>
 
     <!--最热话题APP接口-->
-    <select id="getHotTopicList" resultType="com.elink.esua.epdc.dto.topic.result.HotTopicResultDTO">
+    <select id="selectHotTopicList" resultType="com.elink.esua.epdc.dto.topic.result.HotTopicResultDTO">
         SELECT
         et.ID,
         et.TOPIC_CONTENT content,
@@ -99,17 +99,55 @@
         WHERE
         et.DEL_FLAG = '0'
         AND et.STATE = 0
-        AND DATE_SUB( CURDATE( ), INTERVAL #{someMonthsType} MONTH ) &lt;= et.CREATED_TIME
+        AND DATE_SUB( CURDATE( ), INTERVAL #{hotTopicFormDTO.someMonthsType} MONTH ) &lt;= et.CREATED_TIME
         AND et.GRID_ID IN
         <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
             #{deptIdItem}
         </foreach>
-        <if test="timestamp != null">
+        <if test="hotTopicFormDTO.timestamp != null">
-            <![CDATA[ AND DATE_FORMAT(et.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
+            <![CDATA[ AND DATE_FORMAT(et.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{hotTopicFormDTO.timestamp}
         </if>
         ORDER BY
         statementNum DESC
-        LIMIT #{pageIndex},#{pageSize}
+        LIMIT #{hotTopicFormDTO.pageIndex},#{hotTopicFormDTO.pageSize}
+    </select>
+
+    <!--最新发布话题APP接口-->
+    <resultMap id="newHotTopicListMap" type="com.elink.esua.epdc.dto.topic.result.NewHotTopicResultDTO">
+        <result property="id" column="ID"/>
+        <result property="content" column="TOPIC_CONTENT"/>
+        <result property="deptName" column="ALL_DEPT_NAMES"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <collection property="images" ofType="java.lang.String">
+            <result property="image" column="IMG_URL"/>
+        </collection>
+    </resultMap>
+
+    <select id="selectNewHotTopicList" resultMap="newHotTopicListMap">
+        SELECT
+            et.ID,
+            et.TOPIC_CONTENT,
+            timg.IMG_URL,
+            et.ALL_DEPT_NAMES,
+            et.CREATED_TIME
+        FROM
+            esua_epdc_group.epdc_topic et
+            LEFT JOIN esua_epdc_group.epdc_topic_img timg ON timg.REFERENCE_ID = et.ID
+            AND timg.DEL_FLAG = '0'
+        WHERE
+            et.DEL_FLAG = '0'
+            AND et.STATE = 0
+            AND et.GRID_ID IN
+            <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
+                #{deptIdItem}
+            </foreach>
+            <if test="newHotTopicFormDTO.timestamp != null">
+                <![CDATA[ AND DATE_FORMAT(et.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{newHotTopicFormDTO.timestamp}
+            </if>
+        ORDER BY
+            et.CREATED_TIME DESC,
+            timg.IMG_URL
+            LIMIT #{newHotTopicFormDTO.pageIndex},#{newHotTopicFormDTO.pageSize}
     </select>
 
 </mapper>

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml

@@ -27,4 +27,42 @@
         ORDER BY
             t0.id ASC
     </select>
+
+
+    <select id="selectListUserDataRank" resultType="com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO">
+        SELECT
+            t1.*,
+            t1.userCount - t1.partymemberCount AS residentCount,
+            t1.oldCount / t1.userCount oldPercent,
+            t1.youngCount / t1.userCount youngPercent
+        FROM
+            ( SELECT
+                t.streetName, t.streetId,
+                COUNT( t.userId ) userCount,
+                count( t.SEX = '1' OR NULL ) maleCount,
+                count( t.SEX = '0' OR NULL ) femaleCount,
+                count( t.SEX = '2' OR NULL ) unknownSexCount,
+                COUNT( t.PARTY_FLAG = '1' OR NULL ) partymemberCount,
+                COUNT( t.age > 50 OR NULL ) oldCount,
+                COUNT( ( t.age &lt;= 50 AND t.age > 0 ) OR NULL ) youngCount
+              FROM (
+                SELECT
+                    uu.ID AS userId,
+                    CASE  WHEN uu.SEX != '0' AND uu.SEX != '1' THEN '2' ELSE uu.SEX END AS SEX,
+                    uu.STATE, uu.PARTY_FLAG, uu.DEPT_ID,
+                    IFNULL( TIMESTAMPDIFF( YEAR, uu.BIRTHDAY, CURDATE()), 0 ) age,
+                    ad2.`name` streetName, ad2.id streetId
+                FROM
+                    esua_epdc_user.epdc_user uu
+                    LEFT JOIN esua_epdc_admin.sys_dept ad ON uu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party'
+                    LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad.pid = ad1.id
+                    LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad1.pid = ad2.id
+                    WHERE
+                    uu.DEL_FLAG = '0'
+                    <if test='partyFlag != null and partyFlag = "1"'>AND uu.PARTY_FLAG = '1'</if>
+                    AND ad.id IS NOT NULL
+                ) t
+            GROUP BY t.streetId
+            ) t1
+    </select>
 </mapper>

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisItemController.java

@@ -2,13 +2,23 @@ package com.elink.esua.epdc.controller;
 
 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.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.dto.item.form.ItemAnalysisFormDTO;
+import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO;
+import com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO;
+import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO;
 import com.elink.esua.epdc.service.AnalysisItemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 移动端接口-数据分析模块(项目)
  * @Author LPF
@@ -33,4 +43,35 @@ public class ApiAnalysisItemController {
     public Result test(@LoginUser TokenDto tokenDto) {
         return analysisItemService.test();
     }
+
+    /**
+     * @Description: 重点项目概况
+     * @Param: [formDto]
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO>
+     * @Author: zy
+     * @Date: 2020-02-11
+     */
+    @GetMapping("getItemSurvey")
+    public Result<ItemSurveyResultDTO> getItemSurvey(@RequestBody ItemSurveyFormDTO formDto) {
+        //效验数据
+        ValidatorUtils.validateEntity(formDto);
+        formDto.setGridIds(SecurityUser.getUser().getDeptIdList());
+        return analysisItemService.getItemSurvey(formDto);
+    }
+
+    /** 
+     * @Description: 疑难项目分析 
+     * @Param: [formDto] 
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO>> 
+     * @Author: zy 
+     * @Date: 2020-02-11 
+     */
+    @GetMapping("getItemAnalysis")
+    public Result<List<ItemAnalysisResultDTO>> getItemAnalysis(@RequestBody ItemAnalysisFormDTO formDto) {
+        //效验数据
+        ValidatorUtils.validateEntity(formDto);
+        formDto.setDeptIdList(SecurityUser.getUser().getDeptIdList());
+        Result<List<ItemAnalysisResultDTO>> list = analysisItemService.getItemAnalysis(formDto);
+        return list;
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisTopicController.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.dto.topic.form.HotTopicFormDTO;
+import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO;
 import com.elink.esua.epdc.service.AnalysisTopicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -44,7 +45,19 @@ public class ApiAnalysisTopicController {
      * @Date: 2020/02/11 09:45
      */
     @GetMapping("getHotTopicList")
-    public Result getHotTopicList(@LoginUser TokenDto tokenDto, @RequestBody HotTopicFormDTO hotTopicFormDTO) {
+    public Result getHotTopicList(@RequestBody HotTopicFormDTO hotTopicFormDTO) {
         return analysisTopicService.getHotTopicList(hotTopicFormDTO);
     }
+
+    /**
+     * 最新发布话题接口
+
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<>
+     * @Author: wgf
+     * @Date: 2020/02/11 09:45
+     */
+    @GetMapping("getNewTopicList")
+    public Result getNewTopicList(@RequestBody NewHotTopicFormDTO newHotTopicFormDTO) {
+        return analysisTopicService.getNewTopicList(newHotTopicFormDTO);
+    }
 }

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

@@ -3,11 +3,17 @@ 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.config.FeignRequestInterceptor;
+import com.elink.esua.epdc.dto.item.form.ItemAnalysisFormDTO;
+import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO;
+import com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO;
+import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO;
 import com.elink.esua.epdc.feign.fallback.AnalysisItemFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 
+import java.util.List;
+
 /**
  * 评价模块调用-移动app端
  * @Author LPF
@@ -27,6 +33,24 @@ public interface AnalysisItemFeignClient {
     @GetMapping(value = "analysis/item/test", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result test();
 
+    /**
+     * @Description: 重点项目概况
+     * @Param: [formDTO]
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO>
+     * @Author: zy
+     * @Date: 2020-02-11
+     */
+    @GetMapping(value = "analysis/item/getItemSurvey")
+    Result<ItemSurveyResultDTO> getItemSurvey(ItemSurveyFormDTO formDto);
 
+    /**
+     * @Description: 疑难项目分析
+     * @Param: [formDto]
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO>>
+     * @Author: zy
+     * @Date: 2020-02-11
+     */
+    @GetMapping(value = "analysis/appitem/getItemAnalysis")
+    Result<List<ItemAnalysisResultDTO>> getItemAnalysis(ItemAnalysisFormDTO formDto);
 
 }

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

@@ -4,6 +4,7 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.config.FeignRequestInterceptor;
 import com.elink.esua.epdc.dto.topic.form.HotTopicFormDTO;
+import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO;
 import com.elink.esua.epdc.feign.fallback.AnalysisTopicFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
@@ -31,6 +32,9 @@ public interface AnalysisTopicFeignClient {
     @GetMapping(value = "analysis/apptopic/getHotTopicList", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result getHotTopicList(HotTopicFormDTO hotTopicFormDTO);
 
+    @GetMapping(value = "analysis/apptopic/getNewTopicList", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result getNewTopicList(NewHotTopicFormDTO newHotTopicFormDTO);
+
 
 
 }

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

@@ -3,9 +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.item.form.ItemAnalysisFormDTO;
+import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO;
+import com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO;
+import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO;
 import com.elink.esua.epdc.feign.AnalysisItemFeignClient;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @Author LPF
  * @Date 2019/11/18 16:39
@@ -19,4 +25,14 @@ public class AnalysisItemFeignClientFallback implements AnalysisItemFeignClient
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "test");
     }
 
+    @Override
+    public Result<ItemSurveyResultDTO> getItemSurvey(ItemSurveyFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getItemSurvey", formDto);
+    }
+
+    @Override
+    public Result<List<ItemAnalysisResultDTO>> getItemAnalysis(ItemAnalysisFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getItemAnalysis", formDto);
+    }
+
 }

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

@@ -4,6 +4,7 @@ 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.topic.form.HotTopicFormDTO;
+import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO;
 import com.elink.esua.epdc.feign.AnalysisTopicFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -25,4 +26,9 @@ public class AnalysisTopicFeignClientFallback implements AnalysisTopicFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getHotTopicList");
     }
 
+    @Override
+    public Result getNewTopicList(NewHotTopicFormDTO newHotTopicFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getNewTopicList");
+    }
+
 }

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

@@ -1,6 +1,10 @@
 package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.item.form.ItemAnalysisFormDTO;
+import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO;
+import com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO;
+import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO;
 
 import java.util.List;
 
@@ -20,5 +24,21 @@ public interface AnalysisItemService {
      */
     Result test();
     
+    /** 
+     * @Description: 重点项目概况
+     * @Param: [formDTO] 
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO>
+     * @Author: zy 
+     * @Date: 2020-02-11 
+     */ 
+    Result<ItemSurveyResultDTO> getItemSurvey(ItemSurveyFormDTO formDTO);
 
+    /**
+     * @Description: 疑难项目分析
+     * @Param: [formDto]
+     * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO>>
+     * @Author: zy
+     * @Date: 2020-02-11
+     */
+    Result<List<ItemAnalysisResultDTO>> getItemAnalysis(ItemAnalysisFormDTO formDto);
 }

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

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.topic.form.HotTopicFormDTO;
+import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO;
 
 /**
  * 项目模块-数据分析移动端
@@ -27,5 +28,13 @@ public interface AnalysisTopicService {
      */
     Result getHotTopicList(HotTopicFormDTO hotTopicFormDTO);
 
+    /**
+     * 最新发布话题接口
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<>
+     * @Author: wanggongfeng
+     * @return
+     */
+    Result getNewTopicList(NewHotTopicFormDTO newHotTopicFormDTO);
+
 
 }

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

@@ -2,11 +2,17 @@ package com.elink.esua.epdc.service.impl;
 
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.item.form.ItemAnalysisFormDTO;
+import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO;
+import com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO;
+import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO;
 import com.elink.esua.epdc.feign.AnalysisItemFeignClient;
 import com.elink.esua.epdc.service.AnalysisItemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 项目模块-移动app端
  * @Author LPF
@@ -24,4 +30,14 @@ public class AnalysisItemServiceImpl implements AnalysisItemService {
     public Result test() {
         return analysisItemFeignClient.test();
     }
+
+    @Override
+    public Result<ItemSurveyResultDTO> getItemSurvey(ItemSurveyFormDTO formDTO) {
+        return analysisItemFeignClient.getItemSurvey(formDTO);
+    }
+
+    @Override
+    public Result<List<ItemAnalysisResultDTO>> getItemAnalysis(ItemAnalysisFormDTO formDto) {
+        return analysisItemFeignClient.getItemAnalysis(formDto);
+    }
 }

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

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.topic.form.HotTopicFormDTO;
+import com.elink.esua.epdc.dto.topic.form.NewHotTopicFormDTO;
 import com.elink.esua.epdc.feign.AnalysisTopicFeignClient;
 import com.elink.esua.epdc.service.AnalysisTopicService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,4 +31,9 @@ public class AnalysisTopicServiceImpl implements AnalysisTopicService {
     public Result getHotTopicList(HotTopicFormDTO hotTopicFormDTO) {
         return analysisTopicFeignClient.getHotTopicList(hotTopicFormDTO);
     }
+
+    @Override
+    public Result getNewTopicList(NewHotTopicFormDTO newHotTopicFormDTO) {
+        return analysisTopicFeignClient.getNewTopicList(newHotTopicFormDTO);
+    }
 }