Browse Source

最新发布议题接口

dev
wanggongfeng 6 years ago
parent
commit
d4d3befa7e
  1. 48
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/NewIssueFormDTO.java
  2. 43
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/NewIssueResultDTO.java
  3. 6
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/HotTopicFormDTO.java
  4. 6
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/form/NewHotTopicFormDTO.java
  5. 4
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/topic/result/NewHotTopicResultDTO.java
  6. 53
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/AppIssueAnalysisController.java
  7. 21
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueAnalysisController.java
  8. 9
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueAnalysisDao.java
  9. 11
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueAnalysisService.java
  10. 8
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java
  11. 5
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/dao/TopicAnalysisDao.java
  12. 12
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicAnalysisServiceImpl.java
  13. 52
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueAnalysisDao.xml
  14. 79
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/topic/TopicAnalysisDao.xml
  15. 24
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisIssueController.java
  16. 5
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisTopicController.java
  17. 12
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisIssueFeignClient.java
  18. 8
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisIssueFeignClientFallback.java
  19. 9
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisIssueService.java
  20. 8
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisIssueServiceImpl.java

48
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/NewIssueFormDTO.java

@ -0,0 +1,48 @@
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.List;
/**
* @Description 最新发布议题接口DTO
* @Author wgf
* @Date 2020/2/11 10:31
*/
@Data
public class NewIssueFormDTO implements Serializable {
private static final long serialVersionUID = -1938141144074477454L;
/**
* 页码从1开始
*/
@Min(value = 1, message = "页码必须大于0")
private Integer pageIndex;
/**
* 页容量默认10页
*/
@Min(value = 1, message = "每页条数必须大于必须大于0")
private Integer pageSize = 10;
/**
* 第一页查询发起时的时间
*/
@NotBlank(message = "时间戳不能为空")
private String timestamp;
/**
* 数据时间类型1:最近1个月2:最近3个月3:最近半年4:最近一年,默认1
*/
@NotNull(message = "数据时间类型不能为空")
private Integer someMonthsType = 1;
/**
* 部门ID列表
*/
List<Long> deptIdList;
}

43
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/NewIssueResultDTO.java

@ -0,0 +1,43 @@
package com.elink.esua.epdc.dto.issue.result;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Description 最新发布议题接口DTO
* @Author wgf
* @Date 2020/2/10 11:31
*/
@Data
public class NewIssueResultDTO implements Serializable {
private static final long serialVersionUID = -1938141144074477454L;
/**
* 话题IdTopicId
*/
private String id;
/**
* 内容
*/
private String content;
/**
* 图片
*/
private List<String> images;
/**
* 部门名称
*/
private String deptName;
/**
* 创建时间
*/
private String createdTime;
}

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

@ -5,6 +5,7 @@ import lombok.Data;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.List;
/**
* @Description 最热话题接口入参DTO
@ -38,4 +39,9 @@ public class HotTopicFormDTO implements Serializable {
*/
@NotBlank(message = "数据时间类型不能为空")
private int someMonthsType = 1;
/**
* 部门ID列表
*/
List<Long> gridIds;
}

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

@ -5,6 +5,7 @@ import lombok.Data;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.List;
/**
* @Description 最新发布话题接口入参DTO
@ -38,4 +39,9 @@ public class NewHotTopicFormDTO implements Serializable {
*/
@NotBlank(message = "数据时间类型不能为空")
private int someMonthsType = 1;
/**
* 部门ID列表
*/
List<Long> gridIds;
}

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

@ -6,8 +6,8 @@ import java.io.Serializable;
import java.util.List;
/**
* @Description 话题列表DTO
* @Author yinzuomei
* @Description 最新发布话题接口DTO
* @Author wgf
* @Date 2020/2/10 11:31
*/
@Data

53
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/AppIssueAnalysisController.java

@ -0,0 +1,53 @@
package com.elink.esua.epdc.modules.issue.controller;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO;
import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO;
import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO;
import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO;
import com.elink.esua.epdc.modules.issue.service.IssueAnalysisService;
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;
/**
* @Description 议题App
* @Author wgf
* @Date 2020/2/10 16:06
*/
@RestController
@RequestMapping("appissue")
public class AppIssueAnalysisController {
@Autowired
private IssueAnalysisService issueAnalysisService;
/**
* @Description: 议题项目数量类目分析
* @Param: [tokenDto, formDto]
* @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>>
* @Author: zy
* @Date: 2020-02-11
*/
@GetMapping("getStatisticsByCategory")
public Result<List<IssueStatisticsInfoResultDTO>> getStatisticsByCategory(@RequestBody IssueStatisticsInfoFormDTO formDTO) {
List<IssueStatisticsInfoResultDTO> list = issueAnalysisService.listStatisticsByCategoryList(formDTO);
return new Result<List<IssueStatisticsInfoResultDTO>>().ok(list);
}
/**
* @Description: 最新发布议题接口
* @Param: [tokenDto, formDto]
* @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>>
* @Author: wgf
* @Date: 2020-02-11
*/
@GetMapping("getNewIssueList")
public Result<List<NewIssueResultDTO>> getNewIssueList(@RequestBody NewIssueFormDTO formDTO) {
List<NewIssueResultDTO> list = issueAnalysisService.getNewIssueList(formDTO);
return new Result<List<NewIssueResultDTO>>().ok(list);
}
}

21
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueAnalysisController.java

@ -2,15 +2,15 @@ package com.elink.esua.epdc.modules.issue.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.issue.form.IssueStatisticsInfoFormDTO;
import com.elink.esua.epdc.dto.issue.result.IssueClassifiedStatisticDTO;
import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO;
import com.elink.esua.epdc.modules.issue.service.IssueAnalysisService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
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.List;
import java.util.Map;
/**
@ -63,16 +63,5 @@ public class IssueAnalysisController {
return new Result<PageData<IssueClassifiedStatisticDTO>>().ok(page);
}
/**
* @Description: 议题项目数量类目分析
* @Param: [tokenDto, formDto]
* @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>>
* @Author: zy
* @Date: 2020-02-11
*/
@GetMapping("getStatisticsByCategory")
public Result<List<IssueStatisticsInfoResultDTO>> getStatisticsByCategory(@RequestBody IssueStatisticsInfoFormDTO formDTO) {
List<IssueStatisticsInfoResultDTO> list = issueAnalysisService.listStatisticsByCategoryList(formDTO);
return new Result<List<IssueStatisticsInfoResultDTO>>().ok(list);
}
}

9
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueAnalysisDao.java

@ -19,9 +19,11 @@ package com.elink.esua.epdc.modules.issue.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO;
import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO;
import com.elink.esua.epdc.dto.issue.result.IssueClassifiedStatisticDTO;
import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO;
import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@ -106,4 +108,11 @@ public interface IssueAnalysisDao extends BaseDao<IssueResultDTO> {
* @Date: 2020-02-11
*/
List<IssueStatisticsInfoResultDTO> selectListStatisticsByThreeCategory(IssueStatisticsInfoFormDTO formDto);
/**
* 最新发布议题接口
* @param formDto
* @return
*/
List<NewIssueResultDTO> selectNewIssueList(NewIssueFormDTO formDto);
}

11
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueAnalysisService.java

@ -2,9 +2,11 @@ package com.elink.esua.epdc.modules.issue.service;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO;
import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO;
import com.elink.esua.epdc.dto.issue.result.IssueClassifiedStatisticDTO;
import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO;
import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO;
import java.util.List;
import java.util.Map;
@ -50,4 +52,13 @@ public interface IssueAnalysisService {
* @Date: 2020-02-11
*/
List<IssueStatisticsInfoResultDTO> listStatisticsByCategoryList(IssueStatisticsInfoFormDTO formDto);
/**
* @Description: 最新发布议题接口
* @Param: [formDto]
* @return: java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>
* @Author: wgf
* @Date: 2020-02-11
*/
List<NewIssueResultDTO> getNewIssueList(NewIssueFormDTO formDto);
}

8
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java

@ -9,9 +9,11 @@ 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.issue.form.IssueStatisticsInfoFormDTO;
import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO;
import com.elink.esua.epdc.dto.issue.result.IssueClassifiedStatisticDTO;
import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO;
import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO;
import com.elink.esua.epdc.modules.issue.dao.IssueAnalysisDao;
import com.elink.esua.epdc.modules.issue.service.IssueAnalysisService;
import org.apache.commons.lang3.StringUtils;
@ -112,4 +114,10 @@ public class IssueAnalysisServiceImpl extends BaseServiceImpl<IssueAnalysisDao,
}
return list;
}
@Override
public List<NewIssueResultDTO> getNewIssueList(NewIssueFormDTO formDto) {
List<NewIssueResultDTO> list = baseDao.selectNewIssueList(formDto);
return list;
}
}

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

@ -24,7 +24,6 @@ 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;
@ -61,12 +60,12 @@ public interface TopicAnalysisDao extends BaseMapper<TopicResultDTO> {
* @param hotTopicFormDTO
* @return
*/
List<HotTopicResultDTO> selectHotTopicList(@Param("hotTopicFormDTO")HotTopicFormDTO hotTopicFormDTO,@Param("deptIdList")List<Long> deptIdList);
List<HotTopicResultDTO> selectHotTopicList(HotTopicFormDTO hotTopicFormDTO);
/**
* 最新发布话题接口
* @param newHotTopicFormDTO
* @return
*/
List<NewHotTopicResultDTO> selectNewHotTopicList(@Param("newHotTopicFormDTO")NewHotTopicFormDTO newHotTopicFormDTO, @Param("deptIdList")List<Long> deptIdList);
List<NewHotTopicResultDTO> selectNewHotTopicList(NewHotTopicFormDTO newHotTopicFormDTO);
}

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

@ -76,7 +76,8 @@ public class TopicAnalysisServiceImpl extends BaseServiceImpl<TopicAnalysisDao,
*/
@Override
public Result getHotTopicList(HotTopicFormDTO hotTopicFormDTO){
List<HotTopicResultDTO> list = baseDao.selectHotTopicList(hotTopicFormDTO,SecurityUser.getUser().getDeptIdList());
hotTopicFormDTO.setGridIds(SecurityUser.getUser().getDeptIdList());
List<HotTopicResultDTO> list = baseDao.selectHotTopicList(hotTopicFormDTO);
return new Result().ok(list);
}
@ -88,13 +89,10 @@ public class TopicAnalysisServiceImpl extends BaseServiceImpl<TopicAnalysisDao,
*/
@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());
Long long2 = 1169158285790900226L;*/
newHotTopicFormDTO.setGridIds(SecurityUser.getUser().getDeptIdList());
List<NewHotTopicResultDTO> list = baseDao.selectNewHotTopicList(newHotTopicFormDTO);
return new Result().ok(list);
}

52
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueAnalysisDao.xml

@ -251,4 +251,56 @@
cotegoryName DESC
LIMIT 5;
</select>
<resultMap id="newIssueListMap" type="com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO">
<result property="id" column="ID"/>
<result property="content" column="content"/>
<result property="deptName" column="deptName"/>
<result property="createdTime" column="CREATED_TIME"/>
<collection property="images" ofType="java.lang.String">
<result property="image" column="IMG_URL"/>
</collection>
</resultMap>
<select id="selectNewIssueList" resultMap="newIssueListMap">
SELECT
ei.ID,
ei.ISSUE_CONTENT AS content,
eimg.IMG_URL,
ei.ALL_DEPT_NAMES AS deptName,
ei.CREATED_TIME
FROM
esua_epdc_events.epdc_issue ei
LEFT JOIN esua_epdc_events.epdc_img eimg ON eimg.REFERENCE_ID = ei.EVENT_ID
AND eimg.DEL_FLAG = '0'
WHERE
ei.ID IN (
SELECT
tmp.ID
FROM
(
SELECT
t.ID
FROM
esua_epdc_events.epdc_issue t
WHERE
t.DEL_FLAG = '0'
AND t.ISSUE_STATE IN (0, 2)
AND t.GRID_ID IN
<foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
<if test="timestamp != null and timestamp != ''">
AND DATE_FORMAT( t.CREATED_TIME, '%Y-%m-%d %H:%i:%s' ) &lt;= #{timestamp}
</if>
ORDER BY
t.CREATED_TIME DESC
LIMIT #{pageIndex}, #{pageSize}
) tmp
)
ORDER BY
ei.CREATED_TIME DESC,
eimg.IMG_URL
</select>
</mapper>

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

@ -92,24 +92,35 @@
<select id="selectHotTopicList" resultType="com.elink.esua.epdc.dto.topic.result.HotTopicResultDTO">
SELECT
et.ID,
et.TOPIC_CONTENT content,
et.TOPIC_CONTENT AS content,
( et.COMMENT_NUM + et.BROWSE_NUM ) AS statementNum
FROM
esua_epdc_group.epdc_topic et
WHERE
et.DEL_FLAG = '0'
AND et.STATE = 0
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 collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
<if test="hotTopicFormDTO.timestamp != null">
<![CDATA[ AND DATE_FORMAT(et.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{hotTopicFormDTO.timestamp}
<if test="timestamp != null and timestamp != ''">
AND DATE_FORMAT( et.CREATED_TIME, '%Y-%m-%d %H:%i:%s' ) &lt;= #{timestamp}
</if>
<if test="someMonthsType == 1">
AND DATE_SUB( CURDATE( ), INTERVAL 1 MONTH ) &lt;= et.CREATED_TIME
</if>
<if test="someMonthsType == 2">
AND DATE_SUB( CURDATE( ), INTERVAL 3 MONTH ) &lt;= et.CREATED_TIME
</if>
<if test="someMonthsType == 3">
AND DATE_SUB( CURDATE( ), INTERVAL 6 MONTH ) &lt;= et.CREATED_TIME
</if>
<if test="someMonthsType == 4">
AND DATE_SUB( CURDATE( ), INTERVAL 1 YEAR ) &lt;= et.CREATED_TIME
</if>
ORDER BY
statementNum DESC
LIMIT #{hotTopicFormDTO.pageIndex},#{hotTopicFormDTO.pageSize}
LIMIT #{pageIndex}, #{pageSize}
</select>
<!--最新发布话题APP接口-->
@ -125,29 +136,43 @@
<select id="selectNewHotTopicList" resultMap="newHotTopicListMap">
SELECT
et.ID,
et.TOPIC_CONTENT,
timg.IMG_URL,
et.ALL_DEPT_NAMES,
et.CREATED_TIME
et.ID,
et.TOPIC_CONTENT AS content,
timg.IMG_URL,
et.ALL_DEPT_NAMES AS deptName,
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'
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>
et.ID IN (
SELECT
tmp.ID
FROM
(
SELECT
t.ID
FROM
esua_epdc_group.epdc_topic t
WHERE
t.DEL_FLAG = '0'
AND t.STATE = 0
AND et.GRID_ID IN
<foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
<if test="timestamp != null and timestamp != ''">
AND DATE_FORMAT( et.CREATED_TIME, '%Y-%m-%d %H:%i:%s' ) &lt;= #{timestamp}
</if>
ORDER BY
t.CREATED_TIME DESC
LIMIT #{pageIndex}, #{pageSize}
) tmp
)
ORDER BY
et.CREATED_TIME DESC,
timg.IMG_URL
LIMIT #{newHotTopicFormDTO.pageIndex},#{newHotTopicFormDTO.pageSize}
et.CREATED_TIME DESC,
timg.IMG_URL
</select>
</mapper>

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

@ -6,7 +6,9 @@ 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.issue.form.IssueStatisticsInfoFormDTO;
import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO;
import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO;
import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO;
import com.elink.esua.epdc.service.AnalysisIssueService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -56,4 +58,26 @@ public class ApiAnalysisIssueController {
formDto.setGridIds(SecurityUser.getUser().getDeptIdList());
return analysisIssueService.listStatisticsByCategory(formDto);
}
/**
* @Description: 最新发布议题接口
* @Param: [formDto]
* @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>>
* @Author: wgf
* @Date: 2020-02-11
*/
@GetMapping("getNewIssueList")
public Result<List<NewIssueResultDTO>> getNewIssueList(@RequestBody NewIssueFormDTO formDto) {
//效验数据
ValidatorUtils.validateEntity(formDto);
Long long1 = 1169158285790900226L;
Long long2 = 1169158285790900226L;
List<Long> ll = new ArrayList<Long>();
ll.add(long1);
ll.add(long2);
formDto.setDeptIdList(ll);
//List<Long> aa = SecurityUser.getUser().getDeptIdList();
//formDto.setGridIds(SecurityUser.getUser().getDeptIdList());
return analysisIssueService.getNewIssueList(formDto);
}
}

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

@ -3,6 +3,7 @@ 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.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
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;
@ -46,6 +47,8 @@ public class ApiAnalysisTopicController {
*/
@GetMapping("getHotTopicList")
public Result getHotTopicList(@RequestBody HotTopicFormDTO hotTopicFormDTO) {
//效验数据
ValidatorUtils.validateEntity(hotTopicFormDTO);
return analysisTopicService.getHotTopicList(hotTopicFormDTO);
}
@ -58,6 +61,8 @@ public class ApiAnalysisTopicController {
*/
@GetMapping("getNewTopicList")
public Result getNewTopicList(@RequestBody NewHotTopicFormDTO newHotTopicFormDTO) {
//效验数据
ValidatorUtils.validateEntity(newHotTopicFormDTO);
return analysisTopicService.getNewTopicList(newHotTopicFormDTO);
}
}

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

@ -4,7 +4,9 @@ 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.issue.form.IssueStatisticsInfoFormDTO;
import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO;
import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO;
import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO;
import com.elink.esua.epdc.feign.fallback.AnalysisIssueFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
@ -38,6 +40,14 @@ public interface AnalysisIssueFeignClient {
* @Author: zy
* @Date: 2020-02-11
*/
@GetMapping(value = "analysis/issue/getStatisticsByCategory")
@GetMapping(value = "analysis/appissue/getStatisticsByCategory")
Result<List<IssueStatisticsInfoResultDTO>> getStatisticsByCategory(IssueStatisticsInfoFormDTO formDto);
/**
* 最新发布议题接口
* @param formDto
* @return
*/
@GetMapping(value = "analysis/appissue/getNewIssueList")
Result<List<NewIssueResultDTO>> getNewIssueList(NewIssueFormDTO formDto);
}

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

@ -4,9 +4,10 @@ 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.issue.form.IssueStatisticsInfoFormDTO;
import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO;
import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO;
import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO;
import com.elink.esua.epdc.feign.AnalysisIssueFeignClient;
import org.springframework.stereotype.Component;
import java.util.List;
@ -29,4 +30,9 @@ public class AnalysisIssueFeignClientFallback implements AnalysisIssueFeignClien
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getStatisticsByCategory", formDto);
}
@Override
public Result<List<NewIssueResultDTO>> getNewIssueList(NewIssueFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getNewIssueList", formDto);
}
}

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

@ -2,7 +2,9 @@ package com.elink.esua.epdc.service;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO;
import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO;
import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO;
import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO;
import java.util.List;
@ -30,4 +32,11 @@ public interface AnalysisIssueService {
* @Date: 2020-02-11
*/
Result<List<IssueStatisticsInfoResultDTO>> listStatisticsByCategory(IssueStatisticsInfoFormDTO formDto);
/**
* 最新发布议题接口
* @param formDto
* @return
*/
Result<List<NewIssueResultDTO>> getNewIssueList(NewIssueFormDTO formDto);
}

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

@ -3,10 +3,11 @@ package com.elink.esua.epdc.service.impl;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO;
import com.elink.esua.epdc.dto.issue.form.NewIssueFormDTO;
import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO;
import com.elink.esua.epdc.dto.issue.result.NewIssueResultDTO;
import com.elink.esua.epdc.feign.AnalysisIssueFeignClient;
import com.elink.esua.epdc.service.AnalysisIssueService;
import com.elink.esua.epdc.service.AnalysisItemService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -34,4 +35,9 @@ public class AnalysisIssueServiceImpl implements AnalysisIssueService {
public Result<List<IssueStatisticsInfoResultDTO>> listStatisticsByCategory(IssueStatisticsInfoFormDTO formDto) {
return analysisIssueFeignClient.getStatisticsByCategory(formDto);
}
@Override
public Result<List<NewIssueResultDTO>> getNewIssueList(NewIssueFormDTO formDto) {
return analysisIssueFeignClient.getNewIssueList(formDto);
}
}

Loading…
Cancel
Save