|
|
|
@ -25,6 +25,8 @@ import org.slf4j.LoggerFactory; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
import java.time.LocalDate; |
|
|
|
import java.time.format.DateTimeFormatter; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.List; |
|
|
|
@ -162,7 +164,7 @@ public class ItemAnalysisServiceImpl extends BaseServiceImpl<ItemAnalysisDao, It |
|
|
|
|
|
|
|
@Override |
|
|
|
public Result getCategoryGridDaily(String date) { |
|
|
|
date = StringUtils.isEmpty(date) ? DateUtils.format(new Date()) : date; |
|
|
|
date = StringUtils.isEmpty(date) ? LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern(DateUtils.DATE_PATTERN)) : date; |
|
|
|
List<CategoryGridDailyResultDTO> gridDataList = baseDao.getCategoryGridDaily(); |
|
|
|
String dataJson = ScreenDataUtils.getScreenCategoryDataJson(gridDataList, date, true); |
|
|
|
epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_CATEGORY_GRID_DAILY, dataJson); |
|
|
|
@ -171,7 +173,7 @@ public class ItemAnalysisServiceImpl extends BaseServiceImpl<ItemAnalysisDao, It |
|
|
|
|
|
|
|
@Override |
|
|
|
public Result getCategoryOrgDaily(String date) { |
|
|
|
date = StringUtils.isEmpty(date) ? DateUtils.format(new Date()) : date; |
|
|
|
date = StringUtils.isEmpty(date) ? LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern(DateUtils.DATE_PATTERN)) : date; |
|
|
|
List<CategoryOrgDailyResultDTO> commDataList = baseDao.getCategoryCommDaily(); |
|
|
|
List<CategoryOrgDailyResultDTO> streetDataList = baseDao.getCategoryStreetDaily(); |
|
|
|
List<CategoryOrgDailyResultDTO> orgDataList = new ArrayList<>(); |
|
|
|
|