Browse Source

网格工作评议

feature/dangjian
曲树通 6 years ago
parent
commit
f821261ec8
  1. 8
      esua-epdc/epdc-gateway/pom.xml
  2. 17
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ItemEvaluationLevel.java
  3. 15
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java
  4. 10
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
  5. 12
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
  6. 26
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  7. 29
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
  8. 39
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiEventJobEvaluationFromDTO.java
  9. 2
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMetaDataController.java
  10. 2
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
  11. 13
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/EventFeignClient.java
  12. 6
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/EventFeignClientFallback.java
  13. 9
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiMetaDataService.java
  14. 72
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java

8
esua-epdc/epdc-gateway/pom.xml

@ -99,8 +99,8 @@
<!-- gateway routes -->
<gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
<gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
<!-- <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>-->
<!--<gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>-->
<gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>
<gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
</gateway.routes.epdc-activiti-server.uri>
<!--<gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>-->
@ -116,8 +116,8 @@
<!--<gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>-->
<gateway.routes.epdc-news-server.uri>http://127.0.0.1:9064</gateway.routes.epdc-news-server.uri>
<gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
<gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>
<!-- <gateway.routes.epdc-events-server.uri>http://127.0.0.1:9066</gateway.routes.epdc-events-server.uri>-->
<!--<gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>-->
<gateway.routes.epdc-events-server.uri>http://127.0.0.1:9066</gateway.routes.epdc-events-server.uri>
<gateway.routes.epdc-services-server.uri>lb://epdc-services-server
</gateway.routes.epdc-services-server.uri>
<!-- <gateway.routes.epdc-services-server.uri>http://127.0.0.1:9067</gateway.routes.epdc-services-server.uri>-->

17
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ItemEvaluationLevel.java

@ -0,0 +1,17 @@
package com.elink.esua.epdc.constant;
/**
* @author: qushutong
* @Date: 2019/12/20 15:53
* @Description: 评价结果0-不满意1-基本满意2-非常满意
*/
public interface ItemEvaluationLevel {
String LevaluationLevelBad = "0";
String LevaluationLevelBetter = "1";
String LevaluationLevelBest = "2";
}

15
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java

@ -29,8 +29,8 @@ import com.elink.esua.epdc.dto.KpiMetaDataDTO;
import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO;
import com.elink.esua.epdc.dto.form.EpdcEventsItemMataFromDTO;
import com.elink.esua.epdc.dto.events.form.EventDeleteCommentsFormDTO;
import com.elink.esua.epdc.dto.form.KpiEventEvaluationFromDTO;
import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO;
import com.elink.esua.epdc.dto.form.KpiEventJobEvaluationFromDTO;
import com.elink.esua.epdc.dto.item.ItemDTO;
import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO;
import com.elink.esua.epdc.dto.item.form.ItemHandleSubmitFormDTO;
@ -199,4 +199,17 @@ public class ItemController {
return itemService.ListItemCountData(epdcEventsItemMataFromDTO);
}
/***
* 网格工作评议
* @param kpiEventJobEvaluationFromDTO
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.KpiMetaDataDTO>>
* @author qushutong
* @date 2019/12/20 15:37
*/
@PostMapping("queryListJobEvaluation")
Result<List<KpiMetaDataDTO>> queryListJobEvaluation(@RequestBody KpiEventJobEvaluationFromDTO kpiEventJobEvaluationFromDTO){
return itemService.listJobEvaluation(kpiEventJobEvaluationFromDTO);
}
}

10
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java

@ -20,9 +20,9 @@ package com.elink.esua.epdc.modules.item.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.dto.KpiMetaDataDTO;
import com.elink.esua.epdc.dto.form.EpdcEventsItemMataFromDTO;
import com.elink.esua.epdc.dto.form.KpiEventEvaluationFromDTO;
import com.elink.esua.epdc.dto.events.result.KpiTimeRuleBindItemResoultDto;
import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO;
import com.elink.esua.epdc.dto.form.KpiEventJobEvaluationFromDTO;
import com.elink.esua.epdc.dto.item.ItemDTO;
import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO;
import com.elink.esua.epdc.dto.item.form.ItemCategoryStatisticsFormDTO;
@ -247,4 +247,12 @@ public interface ItemDao extends BaseDao<ItemEntity> {
* @date 2019/12/20 14:30
*/
List<KpiEvaluationAmountResultDTO> selectListPeopleEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto);
/***
* 网格工作评议 不满意 满意 非常满意 统计
* @param kpiEventJobEvaluationFromDTO
* @return java.util.List<com.elink.esua.epdc.dto.KpiMetaDataDTO>
* @author qushutong
* @date 2019/12/20 15:43
*/
List<KpiMetaDataDTO> selectListJobEvaluation(KpiEventJobEvaluationFromDTO kpiEventJobEvaluationFromDTO);
}

12
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java

@ -23,15 +23,14 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.KpiMetaDataDTO;
import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO;
import com.elink.esua.epdc.dto.form.EpdcEventsItemMataFromDTO;
import com.elink.esua.epdc.dto.form.KpiEventEvaluationFromDTO;
import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO;
import com.elink.esua.epdc.dto.form.KpiEventJobEvaluationFromDTO;
import com.elink.esua.epdc.dto.item.ItemDTO;
import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO;
import com.elink.esua.epdc.dto.item.form.*;
import com.elink.esua.epdc.dto.item.result.*;
import com.elink.esua.epdc.dto.result.KpiEvaluationAmountResultDTO;
import com.elink.esua.epdc.modules.item.entity.ItemEntity;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
import java.util.Map;
@ -322,4 +321,13 @@ public interface ItemService extends BaseService<ItemEntity> {
* @date 2019/12/18 16:02
*/
Result<List<KpiMetaDataDTO>> ListItemCountData(EpdcEventsItemMataFromDTO epdcEventsItemMataFromDTO);
/***
* 网格工作评议
* @param kpiEventJobEvaluationFromDTO
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.KpiMetaDataDTO>>
* @author qushutong
* @date 2019/12/20 15:40
*/
Result<List<KpiMetaDataDTO>> listJobEvaluation(KpiEventJobEvaluationFromDTO kpiEventJobEvaluationFromDTO);
}

26
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@ -41,9 +41,9 @@ import com.elink.esua.epdc.dto.SysDeptDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO;
import com.elink.esua.epdc.dto.form.EpdcEventsItemMataFromDTO;
import com.elink.esua.epdc.dto.form.KpiEventEvaluationFromDTO;
import com.elink.esua.epdc.dto.events.result.KpiTimeRuleBindItemResoultDto;
import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO;
import com.elink.esua.epdc.dto.form.KpiEventJobEvaluationFromDTO;
import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO;
import com.elink.esua.epdc.dto.item.ItemDTO;
import com.elink.esua.epdc.dto.item.ItemDeptDTO;
@ -53,7 +53,6 @@ import com.elink.esua.epdc.dto.item.form.*;
import com.elink.esua.epdc.dto.item.result.*;
import com.elink.esua.epdc.dto.result.KpiEvaluationAmountResultDTO;
import com.elink.esua.epdc.enums.ItemHandleCategoryEnum;
import com.elink.esua.epdc.enums.KpiMetaDataEnum;
import com.elink.esua.epdc.modules.async.NewsTask;
import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
import com.elink.esua.epdc.modules.events.service.ImgService;
@ -212,7 +211,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
* 项目列表-移动app端用
*
* @Params: [formDto]
<<<<<<< Updated upstream
* @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.item.result.ItemResultDTO>>
=======
* @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.item.result.ItemResultDTO>>
>>>>>>> Stashed changes
* @Author: lipengfei
* @Date: 2019/10/19 16:47
*/
@ -850,4 +853,23 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
return new Result<List<KpiMetaDataDTO>>().ok(kpiMetaDataDTOList);
}
@Override
public Result<List<KpiMetaDataDTO>> listJobEvaluation(KpiEventJobEvaluationFromDTO kpiEventJobEvaluationFromDTO) {
List<KpiMetaDataDTO> kpiMetaDataDTOList;
List<KpiMetaDataDTO> allMetaDataList = new ArrayList<>();
//统计不满意
kpiEventJobEvaluationFromDTO.setEvaluationLevel(ItemEvaluationLevel.LevaluationLevelBad);
kpiMetaDataDTOList = baseDao.selectListJobEvaluation(kpiEventJobEvaluationFromDTO);
allMetaDataList.addAll(kpiMetaDataDTOList);
//满意
kpiEventJobEvaluationFromDTO.setEvaluationLevel(ItemEvaluationLevel.LevaluationLevelBetter);
kpiMetaDataDTOList = baseDao.selectListJobEvaluation(kpiEventJobEvaluationFromDTO);
allMetaDataList.addAll(kpiMetaDataDTOList);
//非常满意
kpiEventJobEvaluationFromDTO.setEvaluationLevel(ItemEvaluationLevel.LevaluationLevelBest);
kpiMetaDataDTOList = baseDao.selectListJobEvaluation(kpiEventJobEvaluationFromDTO);
allMetaDataList.addAll(kpiMetaDataDTOList);
return null;
}
}

29
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@ -914,4 +914,33 @@
GROUP BY
dept.deptId
</select>
<select id="selectListJobEvaluation" resultType="com.elink.esua.epdc.dto.KpiMetaDataDTO">
SELECT
<if test="evaluationLevel=='0">
'网格评议不满意数' as data_name,
'grid_low_evaluation_amount' as data_code,
</if>
<if test="evaluationLevel=='1">
'网格评议基本满意数' as data_name,
'grid_medium_evaluation_amount' as data_code,
</if>
<if test="evaluationLevel=='2">
'网格评议满意数' as data_name,
'grid_high_evaluation_amount' as data_code,
</if>
COUNT(ed.ID),
#{startTime} as startDate,
DATE(DATE_SUB(#{endTime}, INTERVAL 1 DAY)) as endDate,
FROM
<foreach item="deptId" collection="deptIdList" open="( " separator="UNION ALL" close=") dept">
SELECT #{deptId} AS deptId
</foreach>
LEFT JOIN
epdc_item_evaluate_dept ed ON dept.deptId = ed.DEPT_ID
AND
#{evaluationLevel} = ed.EVALUATION_LEVEL
AND ed.DEL_FLAG = '0' AND ed.CREATED_TIME BETWEEN #{startDate} AND #{endDate}
</select>
</mapper>

39
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiEventJobEvaluationFromDTO.java

@ -0,0 +1,39 @@
package com.elink.esua.epdc.dto.form;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* @author: qushutong
* @Date: 2019/12/20 14:59
* @Description: 网格工作评议 入参
*/
@Data
public class KpiEventJobEvaluationFromDTO implements Serializable {
private static final long serialVersionUID = -370689151754223228L;
/**
* 所有网格
*/
private List<Long> deptIdList;
/**
* 统计周期开始日
*/
private Date startDate;
/**
* 统计周期结束日
*/
private Date endDate;
/***
* 评价结果0-不满意1-基本满意2-非常满意
*/
private String evaluationLevel;
}

2
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMetaDataController.java

@ -106,6 +106,8 @@ public class KpiMetaDataController {
// kpiMetaDataService.statPeopleEvaluation();
//网格呼叫事项总数 与响应呼叫数(议题流转项目)
kpiMetaDataService.createItemMataData();
//网格工作评议
kpiMetaDataService.createJobEvaluation();
return new Result();
}

2
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java

@ -22,7 +22,7 @@ import java.util.List;
* @email yujintao@elink-cn.com
* @date 2019/9/7 9:27
*/
@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class)
@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class,url = "http://127.0.0.1:9092")
public interface AdminFeignClient {
/**

13
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/EventFeignClient.java

@ -7,6 +7,7 @@ import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO;
import com.elink.esua.epdc.dto.form.EpdcEventsItemMataFromDTO;
import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO;
import com.elink.esua.epdc.dto.form.KpiEventEvaluationFromDTO;
import com.elink.esua.epdc.dto.form.*;
import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO;
import com.elink.esua.epdc.dto.result.KpiEvaluationAmountResultDTO;
import com.elink.esua.epdc.dto.result.KpiEventReportAmountResultDTO;
@ -15,7 +16,6 @@ import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
@ -24,7 +24,7 @@ import java.util.List;
* @Date: 2019/12/4 09:28
* @Description: 事件接口
*/
@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = EventFeignClientFallback.class)
@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = EventFeignClientFallback.class,url = "http://127.0.0.1:9066")
public interface EventFeignClient {
/**
@ -81,4 +81,13 @@ public interface EventFeignClient {
@PostMapping(value = "events/item/statPeopleEvaluationMetaData", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<List<KpiEvaluationAmountResultDTO>> statPeopleEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto);
/***
* 获取网格工作评议
* @param kpiEventJobEvaluationFromDTO
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.KpiMetaDataDTO>>
* @author qushutong
* @date 2019/12/20 15:16
*/
@PostMapping(value = "events/item/queryListJobEvaluation", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<List<KpiMetaDataDTO>> queryListJobEvaluation(KpiEventJobEvaluationFromDTO kpiEventJobEvaluationFromDTO);
}

6
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/EventFeignClientFallback.java

@ -8,6 +8,7 @@ import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO;
import com.elink.esua.epdc.dto.form.EpdcEventsItemMataFromDTO;
import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO;
import com.elink.esua.epdc.dto.form.KpiEventEvaluationFromDTO;
import com.elink.esua.epdc.dto.form.*;
import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO;
import com.elink.esua.epdc.dto.result.KpiEvaluationAmountResultDTO;
import com.elink.esua.epdc.dto.result.KpiEventReportAmountResultDTO;
@ -48,4 +49,9 @@ public class EventFeignClientFallback implements EventFeignClient {
public Result<List<KpiEvaluationAmountResultDTO>> statPeopleEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "statPeopleEvaluationMetaData", metaDataFormDto);
}
@Override
public Result<List<KpiMetaDataDTO>> queryListJobEvaluation(KpiEventJobEvaluationFromDTO kpiEventJobEvaluationFromDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "queryListJobEvaluation", kpiEventJobEvaluationFromDTO);
}
}

9
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiMetaDataService.java

@ -120,5 +120,14 @@ public interface KpiMetaDataService extends BaseService<KpiMetaDataEntity> {
* @date 2019/12/18 18:21
*/
void createItemMataData();
/***
* 构建元数据 网格工作评议
* @param
* @return void
* @author qushutong
* @date 2019/12/20 14:48
*/
void createJobEvaluation();
}

72
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java

@ -33,8 +33,8 @@ import com.elink.esua.epdc.dao.KpiMetaDataDao;
import com.elink.esua.epdc.dto.KpiMetaDataDTO;
import com.elink.esua.epdc.dto.form.EpdcEventsItemMataFromDTO;
import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO;
import com.elink.esua.epdc.dto.form.KpiEventEvaluationFromDTO;
import com.elink.esua.epdc.dto.result.KpiEvaluationAmountResultDTO;
import com.elink.esua.epdc.dto.form.KpiEventJobEvaluationFromDTO;
import com.elink.esua.epdc.dto.result.KpiEventReportAmountResultDTO;
import com.elink.esua.epdc.entity.KpiMetaDataEntity;
import com.elink.esua.epdc.enums.KpiCycleEnum;
@ -459,4 +459,74 @@ public class KpiMetaDataServiceImpl extends BaseServiceImpl<KpiMetaDataDao, KpiM
public void deleteRepetitionMetaList(List<KpiMetaDataEntity> metaList) {
baseDao.deleteListRepetitionMeta(metaList);
}
@Override
public void createJobEvaluation() {
setMetaDataOfJobEvaluation(KpiCycleEnum.KPI_CYCLE_MONTH.getValue());
setMetaDataOfJobEvaluation(KpiCycleEnum.KPI_CYCLE_QUARTER.getValue());
setMetaDataOfJobEvaluation(KpiCycleEnum.KPI_CYCLE_YEAR.getValue());
}
private void setMetaDataOfJobEvaluation(String kpiCycle) {
// 获取考核周期开始日
Date startDate = getKpiStartDateByCycle(kpiCycle);
if (null == startDate) {
return;
}
// 初始化接口入参对象,用于传入events模块
KpiEventJobEvaluationFromDTO kpiEventJobEvaluationFromDTO = new KpiEventJobEvaluationFromDTO();
kpiEventJobEvaluationFromDTO.setStartDate(startDate);
kpiEventJobEvaluationFromDTO.setEndDate(LocalDateUtils.localDateToDate(YearMonth.now().minusMonths(NumConstant.ONE).atEndOfMonth()));
queryJobMetaByOrganizationType(kpiCycle, kpiEventJobEvaluationFromDTO,OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT);
queryJobMetaByOrganizationType(kpiCycle, kpiEventJobEvaluationFromDTO,OrganizationTypeConstant.ORG_TYPE_STREET_DEPT);
}
private void queryJobMetaByOrganizationType(String kpiCycle, KpiEventJobEvaluationFromDTO kpiEventJobEvaluationFromDTO,String OrganizationType) {
// 声明页容量和页码
int pageSize = NumConstant.TEN;
int pageIndex = NumConstant.ONE;
List<Long> gridList = deptUtils.getDeptIdList(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT, pageSize, pageIndex);
do {
kpiEventJobEvaluationFromDTO.setDeptIdList(gridList);
// 从events模块获取统计数据
List<KpiMetaDataDTO> jobEvaluationDataList = this.getjobEvaluationDataModule(kpiEventJobEvaluationFromDTO);
// 组装元数据对象
List<KpiMetaDataEntity> kpiMetaDataEntities = this.packageJobMetaDataList(jobEvaluationDataList, kpiCycle,OrganizationType);
// 插入之前删除已存在
this.deleteRepetitionMetaList(kpiMetaDataEntities);
// 插入数据库
this.insertBatch(kpiMetaDataEntities);
pageIndex++;
gridList = deptUtils.getDeptIdList(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY, pageSize, pageIndex);
} while (CollUtil.isNotEmpty(gridList));
}
/***
* 组装数据
* @param KpiMetaDataDTO events模块获取统计数据
* @param kpiCycle
* @return java.util.List<com.elink.esua.epdc.entity.KpiMetaDataEntity>
* @author qushutong
* @date 2019/12/20 15:26
*/
private List<KpiMetaDataEntity> packageJobMetaDataList(List<KpiMetaDataDTO> KpiMetaDataDTO, String kpiCycle,String OrganizationType) {
for (KpiMetaDataDTO item : KpiMetaDataDTO) {
item.setKpiCycle(kpiCycle);
item.setDeptTypeKey(OrganizationType);
}
return ConvertUtils.sourceToTarget(KpiMetaDataDTO,KpiMetaDataEntity.class);
}
private List<KpiMetaDataDTO> getjobEvaluationDataModule(KpiEventJobEvaluationFromDTO kpiEventJobEvaluationFromDTO) {
Result<List<KpiMetaDataDTO>> listResult = eventFeignClient.queryListJobEvaluation(kpiEventJobEvaluationFromDTO);
if (!listResult.success() || null == listResult.getData()) {
log.error("统计事件上报数异常");
throw new RenException("统计事件上报数异常");
}
return listResult.getData();
}
}
Loading…
Cancel
Save