diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/topic/TopicOriginInfoDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/topic/TopicOriginInfoDTO.java index 6ba7b323da..9514d388c5 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/topic/TopicOriginInfoDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/topic/TopicOriginInfoDTO.java @@ -64,7 +64,7 @@ public class TopicOriginInfoDTO implements Serializable { /** * 话题关闭时的状态：已解决 resolved，未解决 unresolved */ - private String closedStatus; +// private String closedStatus; /** * 网格id ( 其实就是小组所属的网格id) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/DimObjectActionConstant.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/DimObjectActionConstant.java index 660cbf4e4b..5476a93a1b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/DimObjectActionConstant.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/DimObjectActionConstant.java @@ -10,5 +10,5 @@ public interface DimObjectActionConstant { /** * 发布话题 */ - String TOPIC_PUBLISH="disscussing"; + String TOPIC_PUBLISH="discussing"; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java index 360571a1e4..018857ae8e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java @@ -1,5 +1,6 @@ package com.epmet.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.DateUtils; @@ -11,6 +12,8 @@ import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyDa import com.epmet.dao.evaluationindex.indexcoll.FactIndexPartyAblityGridMonthlyDao; import com.epmet.dao.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyDao; import com.epmet.dao.evaluationindex.screen.ScreenCustomerGridDao; +import com.epmet.dao.stats.DimCustomerDao; +import com.epmet.dao.stats.DimDateDao; import com.epmet.dto.AgencySubTreeDto; import com.epmet.dto.indexcal.CalculateCommonFormDTO; import com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyEntity; @@ -18,15 +21,16 @@ import com.epmet.entity.evaluationindex.indexcoll.FactIndexPartyAblityGridMonthl import com.epmet.entity.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyEntity; import com.epmet.entity.evaluationindex.screen.ScreenCustomerGridEntity; import com.epmet.entity.stats.DimAgencyEntity; +import com.epmet.entity.stats.DimCustomerEntity; +import com.epmet.entity.stats.DimDateEntity; import com.epmet.service.StatsDemoService; +import com.epmet.service.evaluationindex.extract.FactOriginTopicMainDailyService; import com.epmet.service.evaluationindex.indexcal.*; import com.epmet.service.stats.DimAgencyService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -57,6 +61,24 @@ public class DemoController { private DeptScoreService deptScoreService; @Autowired private IndexCalculateDistrictService indexCalculateDistrictService; + @Autowired + private GridScoreDao gridScoreDao; + @Autowired + private FactIndexPartyAblityGridMonthlyDao factIndexPartyAblityGridMonthlyDao; + @Autowired + private FactIndexGovrnAblityGridMonthlyDao factIndexGovrnAblityGridMonthlyDao; + @Autowired + private FactIndexServiceAblityGridMonthlyDao factIndexServiceAblityGridMonthlyDao; + @Autowired + private ScreenCustomerGridDao screenCustomerGridDao; + @Autowired + private CpcIndexCalculateService cpcIndexCalculateService; + @Autowired + private DimDateDao dimDateDao; + @Autowired + private DimCustomerDao dimCustomerDao; + @Autowired + private FactOriginTopicMainDailyService factOriginTopicMainDailyService; @GetMapping("testAlarm") public void testAlarm() { @@ -147,19 +169,6 @@ public class DemoController { return new Result(); } - @Autowired - private GridScoreDao gridScoreDao; - @Autowired - private FactIndexPartyAblityGridMonthlyDao factIndexPartyAblityGridMonthlyDao; - @Autowired - private FactIndexGovrnAblityGridMonthlyDao factIndexGovrnAblityGridMonthlyDao; - @Autowired - private FactIndexServiceAblityGridMonthlyDao factIndexServiceAblityGridMonthlyDao; - @Autowired - private ScreenCustomerGridDao screenCustomerGridDao; - @Autowired - private CpcIndexCalculateService cpcIndexCalculateService; -// private static Integer testcal=100; @PostMapping("testcal") public Result testCal(){ @@ -487,4 +496,23 @@ public class DemoController { c.setMonthId(monthId); deptScoreService.calculateDeptCorreLation(c); } + + + @PostMapping("inserttopicorigin") + public Result topicDataCleaning(@RequestParam("customerId") String customerId, @RequestParam("dateId")String dateId) { + if (StringUtils.isNotBlank(customerId) && StringUtils.isNotBlank(dateId)) { + factOriginTopicMainDailyService.topicCleaning(customerId,dateId); + }else{ + QueryWrapper customerEntityQueryWrapper = new QueryWrapper<>(); + List customerEntityList=dimCustomerDao.selectList(customerEntityQueryWrapper); + QueryWrapper wrapper = new QueryWrapper<>(); + List dimDateEntityList= dimDateDao.selectList(wrapper); + for(DimCustomerEntity customerEntity:customerEntityList){ + for(DimDateEntity dateEntity:dimDateEntityList){ + factOriginTopicMainDailyService.topicCleaning(customerEntity.getId(),dateEntity.getId()); + } + } + } + return new Result(); + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginController.java index 30fb66b1a9..30f1d9bc06 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginController.java @@ -2,15 +2,12 @@ package com.epmet.controller; import com.epmet.commons.tools.utils.Result; import com.epmet.service.evaluationindex.extract.IssueExtractService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import com.epmet.commons.tools.utils.Result; -import com.epmet.service.evaluationindex.extract.FactOriginTopicMainDailyService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.epmet.service.evaluationindex.extract.FactOriginTopicMainDailyService; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; + /** @@ -36,7 +33,6 @@ public class FactOriginController { return new Result(); } - /** * @param customerId yyyyMMdd * @param dateId yyyyMMdd @@ -46,7 +42,7 @@ public class FactOriginController { * @Date 2020/9/15 13:39 **/ @PostMapping("topic") - public Result topicDataCleaning(String customerId, String dateId) { + public Result topicDataCleaning(@RequestParam("customerId") String customerId, @RequestParam("dateId")String dateId) { if (StringUtils.isNotBlank(customerId) && StringUtils.isNotBlank(dateId)) { factOriginTopicMainDailyService.topicCleaning(customerId,dateId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginTopicMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginTopicMainDailyServiceImpl.java index 8d2da496ee..6b4c2391fd 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginTopicMainDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginTopicMainDailyServiceImpl.java @@ -19,6 +19,7 @@ package com.epmet.service.evaluationindex.extract.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.constant.DimObjectActionConstant; @@ -148,7 +149,8 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl SELECT rto.TOPIC_ID, - rto.OPERATION_TYPE as ACTION_CODE, + (case + when rto.OPERATION_TYPE='closed' and rt.CLOSED_STATUS='resolved' then 'closed_resolved' + when rto.OPERATION_TYPE='closed' and rt.CLOSED_STATUS='unresolved' then 'closed_unresolved' + else rto.OPERATION_TYPE + end + )as ACTION_CODE, rto.CREATED_BY as OPERATE_USER_ID, DATE_FORMAT(rto.CREATED_TIME,'%Y%m%d') as DATE_ID, DATE_FORMAT(rto.CREATED_TIME,'%Y%m') as MONTH_ID, @@ -158,7 +163,6 @@ rto.CREATED_TIME AS ORIGINAL_BUSINESS_TIME, rt.GROUP_ID, rt.STATUS as TOPIC_STATUS, - RT.CLOSED_STATUS, rg.GRID_ID, RG.CUSTOMER_ID FROM @@ -180,7 +184,6 @@ rtc.CREATED_TIME AS ORIGINAL_BUSINESS_TIME, rt.GROUP_ID , rt.STATUS as TOPIC_STATUS, - RT.CLOSED_STATUS, rg.GRID_ID, rg.CUSTOMER_ID FROM