elink-star
/
esua-epdc-cloud
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev_analysis' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_analysis

dev
wanggongfeng 6 years ago
parent
81590efa4d 4817dbf016
commit
eda436252a
12 changed files with 262 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 50
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStatisticsInfoFormDTO.java
  2. 19
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueStatisticsInfoResultDTO.java
  3. 21
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueAnalysisController.java
  4. 29
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueAnalysisDao.java
  5. 12
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueAnalysisService.java
  6. 22
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java
  7. 49
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueAnalysisDao.xml
  8. 22
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisIssueController.java
  9. 16
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisIssueFeignClient.java
  10. 9
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisIssueFeignClientFallback.java
  11. 13
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisIssueService.java
  12. 9
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisIssueServiceImpl.java

50
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueStatisticsInfoFormDTO.java
View File

@ -0,0 +1,50 @@
package com.elink.esua.epdc.dto.issue.form;
import lombok.Data;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import java.util.List;
/**
* @Description 议题项目数量类目分析DTO
* @Author zy
* @Date 2020/2/11 11:58
*/
@Data
public class IssueStatisticsInfoFormDTO {
private static final long serialVersionUID = 6544783947414092507L;
/**
* 主键
*/
private String id;
/**
* 页码
*/
@Min(value = 1, message = "页码必须大于0")
private Integer pageIndex;
/**
* 页容量，默认5页
*/
@Min(value = 1, message = "每页条数必须大于0")
private Integer pageSize;
/**
* 第一页查询发起时的时间
*/
@NotBlank(message = "时间戳不能为空")
private String timestamp;
/**
* 分类类别, 默认1
*/
@NotBlank(message = "分类类别不能为空")
private String cotegoryType;
/**
* 部门ID列表
*/
List<Long> gridIds;
}

19
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueStatisticsInfoResultDTO.java
View File

@ -0,0 +1,19 @@
package com.elink.esua.epdc.dto.issue.result;
/**
* @Description 议题项目数量类目分析DTO
* @Author zy
* @Date 2020/2/11 11:58
*/
public class IssueStatisticsInfoResultDTO {
/**
* 分类名称
*/
private String cotegoryName;
/**
* 数量
*/
private Integer count;
}

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

@ -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.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
@ -62,4 +62,17 @@ public class IssueAnalysisController {
PageData<IssueClassifiedStatisticDTO> page = issueAnalysisService.listIssueClassifiedStatistic(params);
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.getStatisticsByCategoryList(formDTO);
return new Result<List<IssueStatisticsInfoResultDTO>>().ok(list);
}
}

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

@ -18,8 +18,10 @@
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.result.IssueClassifiedStatisticDTO;
import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@ -77,4 +79,31 @@ public interface IssueAnalysisDao extends BaseDao<IssueResultDTO> {
* @Date 2020/2/11 10:09
**/
List<IssueClassifiedStatisticDTO> selectThreeIssueClassifiedStatistic(Map<String, Object> params);
/**
* @Description: 一级类目议题项目数量类目分析
* @Param: [formDto]
* @return: java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>
* @Author: zy
* @Date: 2020-02-11
*/
List<IssueStatisticsInfoResultDTO> getStatisticsByFirstCategory(IssueStatisticsInfoFormDTO formDto);
/**
* @Description: 二级类目议题项目数量类目分析
* @Param: [formDto]
* @return: java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>
* @Author: zy
* @Date: 2020-02-11
*/
List<IssueStatisticsInfoResultDTO> getStatisticsByTwoCategory(IssueStatisticsInfoFormDTO formDto);
/**
* @Description: 三级类目议题项目数量类目分析
* @Param: [formDto]
* @return: java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>
* @Author: zy
* @Date: 2020-02-11
*/
List<IssueStatisticsInfoResultDTO> getStatisticsByThreeCategory(IssueStatisticsInfoFormDTO formDto);
}

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

@ -1,9 +1,12 @@
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.result.IssueClassifiedStatisticDTO;
import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO;
import java.util.List;
import java.util.Map;
/**
@ -38,4 +41,13 @@ public interface IssueAnalysisService {
* @Date 2020/2/11 9:41
**/
PageData<IssueClassifiedStatisticDTO> listIssueClassifiedStatistic(Map<String, Object> params);
/**
* @Description: 议题项目数量类目分析
* @Param: [formDto]
* @return: java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>
* @Author: zy
* @Date: 2020-02-11
*/
List<IssueStatisticsInfoResultDTO> getStatisticsByCategoryList(IssueStatisticsInfoFormDTO formDto);
}

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

@ -8,8 +8,10 @@ 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.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.dao.IssueAnalysisDao;
import com.elink.esua.epdc.modules.issue.service.IssueAnalysisService;
import org.apache.commons.lang3.StringUtils;
@ -87,4 +89,24 @@ public class IssueAnalysisServiceImpl extends BaseServiceImpl<IssueAnalysisDao,
}
return new PageData<>(list, page.getTotal());
}
/**
* @Description: 议题项目数量类目分析
* @Param: [formDto]
* @return: java.util.List<com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO>
* @Author: zy
* @Date: 2020-02-11
*/
@Override
public List<IssueStatisticsInfoResultDTO> getStatisticsByCategoryList(IssueStatisticsInfoFormDTO formDto) {
List<IssueStatisticsInfoResultDTO> list = new ArrayList<>();
if ("1".equals(formDto.getCotegoryType())){
list = baseDao.getStatisticsByFirstCategory(formDto);
} else if ("2".equals(formDto.getCotegoryType())) {
list = baseDao.getStatisticsByFirstCategory(formDto);
} else if ("3".equals(formDto.getCotegoryType())) {
list = baseDao.getStatisticsByFirstCategory(formDto);
}
return list;
}
}

49
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueAnalysisDao.xml
View File

@ -187,4 +187,53 @@
<include refid="common_order-if"/>
</select>
<select id="getStatisticsByFirstCategory" resultType="com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO">
SELECT
SUBSTRING_INDEX( ei.CATEGORY_FULL_NAME, '-', 1 ) AS categoryName,
COUNT( ei.ID ) AS categoryNum
FROM
esua_epdc_events.epdc_issue ei
WHERE
ei.DEL_FLAG = '0'
AND ei.GRID_ID IN (#{gridIds})
GROUP BY
SUBSTRING_INDEX( ei.CATEGORY_FULL_NAME, '-', 1 )
ORDER BY
categoryNum DESC
LIMIT 5;
</select>
<select id="getStatisticsByTwoCategory" resultType="com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO">
SELECT
SUBSTRING_INDEX( ei.CATEGORY_FULL_NAME, '-', 2 ) AS categoryName,
COUNT( ei.ID ) AS categoryNum
FROM
esua_epdc_events.epdc_issue ei
WHERE
ei.DEL_FLAG = '0'
AND ( LENGTH( ei.CATEGORY_FULL_NAME ) - LENGTH( REPLACE ( ei.CATEGORY_FULL_NAME, '-', '' ) ) ) > 0
AND ei.GRID_ID IN (#{gridIds})
GROUP BY
SUBSTRING_INDEX( SUBSTRING_INDEX( ei.CATEGORY_FULL_NAME, '-', 2 ), '-', - 1 )
ORDER BY
categoryNum DESC
LIMIT 5;
</select>
<select id="getStatisticsByThreeCategory" resultType="com.elink.esua.epdc.dto.issue.form.IssueStatisticsInfoFormDTO">
SELECT
SUBSTRING_INDEX( ei.CATEGORY_FULL_NAME, '-', 3 ) AS categoryName,
COUNT( ei.ID ) AS categoryNum
FROM
esua_epdc_events.epdc_issue ei
WHERE
ei.DEL_FLAG = '0'
AND ( LENGTH( ei.CATEGORY_FULL_NAME ) - LENGTH( REPLACE ( ei.CATEGORY_FULL_NAME, '-', '' ) ) ) > 1
AND ei.GRID_ID IN (#{gridIds})
GROUP BY
SUBSTRING_INDEX( SUBSTRING_INDEX( ei.CATEGORY_FULL_NAME, '-', 3 ), '-', - 1 )
ORDER BY
categoryNum DESC
LIMIT 5;
</select>
</mapper>

22
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisIssueController.java
View File

@ -2,14 +2,19 @@ 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.issue.form.IssueStatisticsInfoFormDTO;
import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO;
import com.elink.esua.epdc.service.AnalysisIssueService;
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.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* 移动端接口-数据分析模块(项目)
* @Author LPF
@ -34,4 +39,19 @@ public class ApiAnalysisIssueController {
public Result test(@LoginUser TokenDto tokenDto) {
return analysisIssueService.test();
}
/**
* @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(@LoginUser TokenDto tokenDto, IssueStatisticsInfoFormDTO formDto) {
//效验数据
ValidatorUtils.validateEntity(formDto);
formDto.setGridIds(SecurityUser.getUser().getDeptIdList());
return analysisIssueService.getStatisticsByCategory(formDto);
}
}

16
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisIssueFeignClient.java
View File

@ -3,12 +3,15 @@ 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.issue.form.IssueStatisticsInfoFormDTO;
import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO;
import com.elink.esua.epdc.feign.fallback.AnalysisIssueFeignClientFallback;
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
@ -28,6 +31,13 @@ public interface AnalysisIssueFeignClient {
@GetMapping(value = "analysis/item/test", consumes = MediaType.APPLICATION_JSON_VALUE)
Result test();
/**
* @Description: 议题项目数量类目分析
* @Param: [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(value = "analysis/issue/getStatisticsByCategory", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<List<IssueStatisticsInfoResultDTO>> getStatisticsByCategory(IssueStatisticsInfoFormDTO formDto);
}

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

@ -3,10 +3,14 @@ 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.issue.form.IssueStatisticsInfoFormDTO;
import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO;
import com.elink.esua.epdc.feign.AnalysisIssueFeignClient;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* @Author LPF
* @Date 2019/11/18 16:39
@ -20,4 +24,9 @@ public class AnalysisIssueFeignClientFallback implements AnalysisIssueFeignClien
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "test");
}
@Override
public Result<List<IssueStatisticsInfoResultDTO>> getStatisticsByCategory(IssueStatisticsInfoFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getStatisticsByCategory", formDto);
}
}

13
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisIssueService.java
View File

@ -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.issue.form.IssueStatisticsInfoFormDTO;
import com.elink.esua.epdc.dto.issue.result.IssueStatisticsInfoResultDTO;
import java.util.List;
/**
* 项目模块-数据分析移动端
@ -18,5 +22,12 @@ public interface AnalysisIssueService {
*/
Result test();
/**
* @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
*/
Result<List<IssueStatisticsInfoResultDTO>> getStatisticsByCategory(IssueStatisticsInfoFormDTO formDto);
}

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

@ -2,12 +2,16 @@ 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.result.IssueStatisticsInfoResultDTO;
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;
import java.util.List;
/**
* 项目模块-移动app端
* @Author LPF
@ -25,4 +29,9 @@ public class AnalysisIssueServiceImpl implements AnalysisIssueService {
public Result test() {
return analysisIssueFeignClient.test();
}
@Override
public Result<List<IssueStatisticsInfoResultDTO>> getStatisticsByCategory(IssueStatisticsInfoFormDTO formDto) {
return analysisIssueFeignClient.getStatisticsByCategory(formDto);
}
}

Write Preview
Loading…
Cancel
Save