luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

项目抽取修改

master
zhaoqifeng 4 years ago
parent
20122b4936
commit
a42931f6d7
4 changed files with 508 additions and 3 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. 12
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginExtractController.java
  2. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java
  3. 189
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/OrgRankStatisticsService.java
  4. 306
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/OrgRankStatisticsServiceImpl.java

12
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginExtractController.java
View File

@ -95,8 +95,18 @@ public class FactOriginExtractController {
@PostMapping("project")
public Result projectData(@RequestBody ExtractOriginFormDTO extractOriginFormDTO) {
if (null != extractOriginFormDTO) {
if (StringUtils.isNotBlank(extractOriginFormDTO.getCustomerId())) {
List<String> daysBetween;
if (StringUtils.isBlank(extractOriginFormDTO.getDateId())) {
daysBetween = DateUtils.getDaysBetween(extractOriginFormDTO.getStartDate(), extractOriginFormDTO.getEndDate());
daysBetween.forEach(dateId -> {
extractOriginFormDTO.setDateId(dateId);
projectExtractService.saveOriginProjectDaily(extractOriginFormDTO);
});
} else{
projectExtractService.saveOriginProjectDaily(extractOriginFormDTO);
}
} else {
List<String> customerIds = dimCustomerService.selectCustomerIdPage(1, 100);
customerIds.forEach(customerId -> {

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java
View File

@ -224,7 +224,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
}));
//插入数据
if (!list.isEmpty()) {
factOriginProjectMainDailyService.saveOrUpdateBatch(list);
factOriginProjectMainDailyService.insertBatch(list);
}
}

189
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/OrgRankStatisticsService.java
View File

@ -0,0 +1,189 @@
package com.epmet.service.evaluationindex.extract.toscreen;
import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
import java.util.Map;
/**
* @Description
* @Author zhaoqifeng
* @Date 2021/12/7 10:43
*/
public interface OrgRankStatisticsService {
/**
* 网格被吹哨项目数
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
Map<String, OrgStatisticsResultDTO> getGridProjectCount(String customerId, String monthId, String dateId);
/**
* 部门被吹哨项目数
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
Map<String, OrgStatisticsResultDTO> getDeptProjectCount(String customerId, String monthId, String dateId);
/**
* 组织被吹哨项目数（含下级组织网格部门）
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
Map<String, OrgStatisticsResultDTO> getAgencyProjectCount(String customerId, String monthId, String dateId);
/**
* 网格被吹哨项目中已结案项目数
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
Map<String, OrgStatisticsResultDTO> getGridProjectClosedCount(String customerId, String monthId, String dateId);
/**
* 部门被吹哨项目中已结案项目数
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
Map<String, OrgStatisticsResultDTO> getDeptProjectClosedCount(String customerId, String monthId, String dateId);
/**
* 组织被吹哨项目中已结案项目数（含下级组织网格部门）
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
Map<String, OrgStatisticsResultDTO> getAgencyProjectClosedCount(String customerId, String monthId, String dateId);
/**
* 网格被吹哨项目中自己办结项目数
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
Map<String, OrgStatisticsResultDTO> getGridProjectResolvedCount(String customerId, String monthId, String dateId);
/**
* 部门被吹哨项目中自己办结项目数
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
Map<String, OrgStatisticsResultDTO> getDeptProjectResolvedCount(String customerId, String monthId, String dateId);
/**
* 组织被吹哨项目中自己办结项目数（含下级组织网格部门）
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
Map<String, OrgStatisticsResultDTO> getAgencyProjectResolvedCount(String customerId, String monthId, String dateId);
/**
* 网格自治项目数
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
Map<String, OrgStatisticsResultDTO> getGridProjectSelfCount(String customerId, String monthId, String dateId);
/**
* 部门自治项目数
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
Map<String, OrgStatisticsResultDTO> getDeptProjectSelfCount(String customerId, String monthId, String dateId);
/**
* 组织自治项目数（含下级组织网格部门）
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
Map<String, OrgStatisticsResultDTO> getAgencyProjectSelfCount(String customerId, String monthId, String dateId);
/**
* 网格产生的项目数
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
Map<String, OrgStatisticsResultDTO> getGridProjectTotal(String customerId, String monthId, String dateId);
/**
* 组织产生的项目数（含下级组织网格部门）
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
Map<String, OrgStatisticsResultDTO> getAgencyProjectTotal(String customerId, String monthId, String dateId);
/**
* 网格产生的项目数中结案的项目数
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
Map<String, OrgStatisticsResultDTO> getGridProjectClosedTotal(String customerId, String monthId, String dateId);
/**
* 组织产生的项目数中结案的项目数（含下级组织网格部门）
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
Map<String, OrgStatisticsResultDTO> getAgencyProjectClosedTotal(String customerId, String monthId, String dateId);
}

306
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/OrgRankStatisticsServiceImpl.java
View File

@ -0,0 +1,306 @@
package com.epmet.service.evaluationindex.extract.toscreen.impl;
import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
import com.epmet.service.evaluationindex.extract.toscreen.OrgRankStatisticsService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.Map;
/**
* @Description
* @Author zhaoqifeng
* @Date 2021/12/7 10:43
*/
@Service
@Slf4j
public class OrgRankStatisticsServiceImpl implements OrgRankStatisticsService {
/**
* 网格被吹哨项目数
*
* @param customerId
* @param monthId
* @param dateId
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map < String, OrgStatisticsResultDTO >}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
@Override
public Map<String, OrgStatisticsResultDTO> getGridProjectCount(String customerId, String monthId, String dateId) {
return null;
}
/**
* 部门被吹哨项目数
*
* @param customerId
* @param monthId
* @param dateId
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
@Override
public Map<String, OrgStatisticsResultDTO> getDeptProjectCount(String customerId, String monthId, String dateId) {
return null;
}
/**
* 组织被吹哨项目数（含下级组织网格部门）
*
* @param customerId
* @param monthId
* @param dateId
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
@Override
public Map<String, OrgStatisticsResultDTO> getAgencyProjectCount(String customerId, String monthId, String dateId) {
return null;
}
/**
* 网格被吹哨项目中已结案项目数
*
* @param customerId
* @param monthId
* @param dateId
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
@Override
public Map<String, OrgStatisticsResultDTO> getGridProjectClosedCount(String customerId, String monthId, String dateId) {
return null;
}
/**
* 部门被吹哨项目中已结案项目数
*
* @param customerId
* @param monthId
* @param dateId
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
@Override
public Map<String, OrgStatisticsResultDTO> getDeptProjectClosedCount(String customerId, String monthId, String dateId) {
return null;
}
/**
* 组织被吹哨项目中已结案项目数（含下级组织网格部门）
*
* @param customerId
* @param monthId
* @param dateId
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
@Override
public Map<String, OrgStatisticsResultDTO> getAgencyProjectClosedCount(String customerId, String monthId, String dateId) {
return null;
}
/**
* 网格被吹哨项目中自己办结项目数
*
* @param customerId
* @param monthId
* @param dateId
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
@Override
public Map<String, OrgStatisticsResultDTO> getGridProjectResolvedCount(String customerId, String monthId, String dateId) {
return null;
}
/**
* 部门被吹哨项目中自己办结项目数
*
* @param customerId
* @param monthId
* @param dateId
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
@Override
public Map<String, OrgStatisticsResultDTO> getDeptProjectResolvedCount(String customerId, String monthId, String dateId) {
return null;
}
/**
* 组织被吹哨项目中自己办结项目数（含下级组织网格部门）
*
* @param customerId
* @param monthId
* @param dateId
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
@Override
public Map<String, OrgStatisticsResultDTO> getAgencyProjectResolvedCount(String customerId, String monthId, String dateId) {
return null;
}
/**
* 网格自治项目数
*
* @param customerId
* @param monthId
* @param dateId
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
@Override
public Map<String, OrgStatisticsResultDTO> getGridProjectSelfCount(String customerId, String monthId, String dateId) {
return null;
}
/**
* 部门自治项目数
*
* @param customerId
* @param monthId
* @param dateId
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
@Override
public Map<String, OrgStatisticsResultDTO> getDeptProjectSelfCount(String customerId, String monthId, String dateId) {
return null;
}
/**
* 组织自治项目数（含下级组织网格部门）
*
* @param customerId
* @param monthId
* @param dateId
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
@Override
public Map<String, OrgStatisticsResultDTO> getAgencyProjectSelfCount(String customerId, String monthId, String dateId) {
return null;
}
/**
* 网格产生的项目数
*
* @param customerId
* @param monthId
* @param dateId
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
@Override
public Map<String, OrgStatisticsResultDTO> getGridProjectTotal(String customerId, String monthId, String dateId) {
return null;
}
/**
* 组织产生的项目数（含下级组织网格部门）
*
* @param customerId
* @param monthId
* @param dateId
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
@Override
public Map<String, OrgStatisticsResultDTO> getAgencyProjectTotal(String customerId, String monthId, String dateId) {
return null;
}
/**
* 网格产生的项目数中结案的项目数
*
* @param customerId
* @param monthId
* @param dateId
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
@Override
public Map<String, OrgStatisticsResultDTO> getGridProjectClosedTotal(String customerId, String monthId, String dateId) {
return null;
}
/**
* 组织产生的项目数中结案的项目数（含下级组织网格部门）
*
* @param customerId
* @param monthId
* @param dateId
* @Param customerId
* @Param monthId
* @Param dateId
* @Return {@link Map< String, OrgStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2021/12/7 10:52
*/
@Override
public Map<String, OrgStatisticsResultDTO> getAgencyProjectClosedTotal(String customerId, String monthId, String dateId) {
return null;
}
}
Write Preview
Loading…
Cancel
Save