forked from rongchao/epmet-cloud-rizhao
zhaoqifeng
4 years ago
36 changed files with 423 additions and 17 deletions
@ -0,0 +1,19 @@ |
|||
package com.epmet.service; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author zhaoqifeng |
|||
* @Date 2022/3/15 10:09 |
|||
*/ |
|||
public interface HistoryDataService { |
|||
/** |
|||
* 网格员立项来源改为work_event |
|||
* |
|||
* @Param customerId |
|||
* @Return |
|||
* @Author zhaoqifeng |
|||
* @Date 2022/3/15 10:13 |
|||
*/ |
|||
void projectAddGridId(String customerId); |
|||
|
|||
} |
|||
@ -0,0 +1,75 @@ |
|||
package com.epmet.service.impl; |
|||
|
|||
import com.epmet.commons.tools.utils.ConvertUtils; |
|||
import com.epmet.constant.RoleKeyConstants; |
|||
import com.epmet.dto.org.CustomerStaffGridDTO; |
|||
import com.epmet.dto.user.result.StaffRoleInfoDTO; |
|||
import com.epmet.service.HistoryDataService; |
|||
import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDailyService; |
|||
import com.epmet.service.evaluationindex.screen.ScreenProjectDataService; |
|||
import com.epmet.service.org.CustomerGridService; |
|||
import com.epmet.service.project.ProjectService; |
|||
import com.epmet.service.user.UserService; |
|||
import org.apache.commons.collections4.CollectionUtils; |
|||
import org.springframework.stereotype.Service; |
|||
|
|||
import javax.annotation.Resource; |
|||
import java.util.List; |
|||
import java.util.Map; |
|||
import java.util.function.Function; |
|||
import java.util.stream.Collectors; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author zhaoqifeng |
|||
* @Date 2022/3/15 10:12 |
|||
*/ |
|||
@Service |
|||
public class HistoryDataServiceImpl implements HistoryDataService { |
|||
@Resource |
|||
CustomerGridService customerGridService; |
|||
@Resource |
|||
private UserService userService; |
|||
@Resource |
|||
private ProjectService projectService; |
|||
@Resource |
|||
private FactOriginProjectMainDailyService factOriginProjectMainDailyService; |
|||
@Resource |
|||
private ScreenProjectDataService screenProjectDataService; |
|||
|
|||
/** |
|||
* 网格员立项来源改为work_event |
|||
* |
|||
* @param customerId |
|||
* @Param customerId |
|||
* @Return |
|||
* @Author zhaoqifeng |
|||
* @Date 2022/3/15 10:13 |
|||
*/ |
|||
@Override |
|||
public void projectAddGridId(String customerId) { |
|||
List<CustomerStaffGridDTO> staffGridList = customerGridService.getCustomerStaffGridList(customerId); |
|||
List<StaffRoleInfoDTO> staffInfoList = userService.getStaffByRoleKey(customerId, RoleKeyConstants.ROLE_KEY_GRID_MEMBER); |
|||
if (CollectionUtils.isEmpty(staffGridList) || CollectionUtils.isEmpty(staffInfoList)) { |
|||
return; |
|||
} |
|||
Map<String, StaffRoleInfoDTO> staffMap = staffInfoList.stream().collect(Collectors.toMap(StaffRoleInfoDTO :: getStaffId, |
|||
Function.identity())); |
|||
List<CustomerStaffGridDTO> list = staffGridList.stream().filter(p -> null != staffMap.get(p.getStaffId())).map(item -> { |
|||
StaffRoleInfoDTO staffInfo = staffMap.get(item.getStaffId()); |
|||
CustomerStaffGridDTO dto = ConvertUtils.sourceToTarget(item, CustomerStaffGridDTO.class); |
|||
dto.setStaffId(staffInfo.getStaffId()); |
|||
return dto; |
|||
}).collect(Collectors.toList()); |
|||
|
|||
list.forEach(part -> { |
|||
//更新project表
|
|||
projectService.updateHistoryData(part); |
|||
//更新fact_origin_project_main_daily
|
|||
factOriginProjectMainDailyService.updateHistoryData(part); |
|||
//更新screen_project_data
|
|||
screenProjectDataService.updateHistoryData(part); |
|||
}); |
|||
|
|||
} |
|||
} |
|||
@ -0,0 +1,13 @@ |
|||
ALTER TABLE `epmet_data_statistical`.`fact_origin_project_main_daily` |
|||
MODIFY COLUMN `ORIGIN` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '项目来源 来源：议题issue 组织agency，事件resi_event 工作人员上报:work_event' AFTER `PIDS`; |
|||
ALTER TABLE `epmet_evaluation_index`.`screen_project_data` |
|||
MODIFY COLUMN `ORIGIN` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源：议题issue 项目立项:agency 事件:resi_event； add1015\r\n工作人员上报:work_event' AFTER `ALL_PARENT_IDS`; |
|||
|
|||
|
|||
ALTER TABLE `epmet_data_statistical`.`fact_agency_govern_daily` |
|||
ADD COLUMN `WORK_EVENT_RESOLVED_COUNT` int(11) NULL DEFAULT 0 COMMENT '17、当前组织内：来源于工作人员上报事件的项目：结案已解决数' AFTER `EVENT_UN_RESOLVED_COUNT`, |
|||
ADD COLUMN `WORK_EVENT_UN_RESOLVED_COUNT` int(11) NULL DEFAULT 0 COMMENT '18、当前组织内：来源于工作人员上报事件的项目：结案无需解决数' AFTER `WORK_EVENT_RESOLVED_COUNT`; |
|||
|
|||
ALTER TABLE `epmet_data_statistical`.`fact_grid_govern_daily` |
|||
ADD COLUMN `WORK_EVENT_RESOLVED_COUNT` int(11) NULL DEFAULT 0 COMMENT '21、当前组织内：来源于工作人员上报事件的项目：结案已解决数' AFTER `EVENT_UN_RESOLVED_COUNT`, |
|||
ADD COLUMN `WORK_EVENT_UN_RESOLVED_COUNT` int(11) NULL DEFAULT 0 COMMENT '22、当前组织内：来源于工作人员上报事件的项目：结案无需解决数' AFTER `WORK_EVENT_RESOLVED_COUNT`; |
|||
@ -0,0 +1,2 @@ |
|||
ALTER TABLE `epmet_gov_project`.`project` |
|||
MODIFY COLUMN `ORIGIN` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源：议题issue 项目立项:agency 事件:resi_event 工作人员上报:work_event' AFTER `AGENCY_ID`; |
|||
Loading…
Reference in new issue