议题数据查询

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/issue/impl/IssueServiceImpl.java

@@ -2,6 +2,7 @@ package com.epmet.service.issue.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dao.issue.IssueDao;
 import com.epmet.dto.form.LoginUserDetailsFormDTO;
 import com.epmet.dto.result.LoginUserDetailsResultDTO;
@@ -17,6 +18,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -35,15 +37,29 @@ public class IssueServiceImpl implements IssueService {
 		IssueSummaryInfoResultDTO result = new IssueSummaryInfoResultDTO();
 		String agencyId = getAgencyId(tokenDto);
 		IssueDataDTO data = issueDao.selectAgencyInfo(agencyId);
-		result.setAgencyId(agencyId);
+		if (null == data) {
-		result.setDateName(data.getDateName());
+			//获取当前日期前一天
-		result.setIssueTotal(data.getIssueTotal());
+			Date date = DateUtils.getBeforeDay(new Date());
-		result.setVotingTotal(data.getVotingTotal());
+			result.setAgencyId(agencyId);
-		result.setShiftProjectTotal(data.getShiftProjectTotal());
+			result.setDateName(DateUtils.format(date, "yyyy.MM.dd"));
-		result.setClosedTotal(data.getClosedTotal());
+			result.setIssueTotal(NumConstant.ZERO);
-		result.setVotingRatio(toRatio(data.getVotingPercent()));
+			result.setVotingTotal(NumConstant.ZERO);
-		result.setShiftProjectRatio(toRatio(data.getShiftProjectPercent()));
+			result.setShiftProjectTotal(NumConstant.ZERO);
-		result.setClosedRatio(toRatio(data.getClosedPercent()));
+			result.setClosedTotal(NumConstant.ZERO);
+			result.setVotingRatio("0%");
+			result.setShiftProjectRatio("0%");
+			result.setClosedRatio("0%");
+		} else {
+			result.setAgencyId(agencyId);
+			result.setDateName(data.getDateName());
+			result.setIssueTotal(data.getIssueTotal());
+			result.setVotingTotal(data.getVotingTotal());
+			result.setShiftProjectTotal(data.getShiftProjectTotal());
+			result.setClosedTotal(data.getClosedTotal());
+			result.setVotingRatio(toRatio(data.getVotingPercent()));
+			result.setShiftProjectRatio(toRatio(data.getShiftProjectPercent()));
+			result.setClosedRatio(toRatio(data.getClosedPercent()));
+		}
 		return result;
 	}
 
@@ -52,21 +68,39 @@ public class IssueServiceImpl implements IssueService {
 		List<IssueSummaryPieResultDTO> list = new ArrayList<>();
 		String agencyId = getAgencyId(tokenDto);
 		IssueDataDTO data = issueDao.selectAgencyInfo(agencyId);
-		IssueSummaryPieResultDTO voting = new IssueSummaryPieResultDTO();
+		if (null == data) {
-		voting.setName(IssueConstant.VOTING_NAME);
+			IssueSummaryPieResultDTO voting = new IssueSummaryPieResultDTO();
-		voting.setValue(data.getVotingTotal());
+			voting.setName(IssueConstant.VOTING_NAME);
-		voting.setRatio(toRatio(data.getVotingPercent()));
+			voting.setValue(NumConstant.ZERO);
-		list.add(voting);
+			voting.setRatio("0%");
-		IssueSummaryPieResultDTO shift = new IssueSummaryPieResultDTO();
+			list.add(voting);
-		shift.setName(IssueConstant.SHIFT_NAME);
+			IssueSummaryPieResultDTO shift = new IssueSummaryPieResultDTO();
-		shift.setValue(data.getShiftProjectTotal());
+			shift.setName(IssueConstant.SHIFT_NAME);
-		shift.setRatio(toRatio(data.getShiftProjectPercent()));
+			shift.setValue(NumConstant.ZERO);
-		list.add(shift);
+			shift.setRatio("0%");
-		IssueSummaryPieResultDTO closed = new IssueSummaryPieResultDTO();
+			list.add(shift);
-		closed.setName(IssueConstant.CLOSED_NAME);
+			IssueSummaryPieResultDTO closed = new IssueSummaryPieResultDTO();
-		closed.setValue(data.getClosedTotal());
+			closed.setName(IssueConstant.CLOSED_NAME);
-		closed.setRatio(toRatio(data.getClosedPercent()));
+			closed.setValue(NumConstant.ZERO);
-		list.add(closed);
+			closed.setRatio("0%");
+			list.add(closed);
+		} else {
+			IssueSummaryPieResultDTO voting = new IssueSummaryPieResultDTO();
+			voting.setName(IssueConstant.VOTING_NAME);
+			voting.setValue(data.getVotingTotal());
+			voting.setRatio(toRatio(data.getVotingPercent()));
+			list.add(voting);
+			IssueSummaryPieResultDTO shift = new IssueSummaryPieResultDTO();
+			shift.setName(IssueConstant.SHIFT_NAME);
+			shift.setValue(data.getShiftProjectTotal());
+			shift.setRatio(toRatio(data.getShiftProjectPercent()));
+			list.add(shift);
+			IssueSummaryPieResultDTO closed = new IssueSummaryPieResultDTO();
+			closed.setName(IssueConstant.CLOSED_NAME);
+			closed.setValue(data.getClosedTotal());
+			closed.setRatio(toRatio(data.getClosedPercent()));
+			list.add(closed);
+		}
 		return list;
 	}
 

epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/IssueDao.xml

@@ -13,7 +13,7 @@
                CLOSED_TOTAL,
                CLOSED_PERCENT,
                MAX(DATE_ID) AS DATE_ID,
-               DATE_FORMAT(DATE_ID, '%Y.%m.%d') AS DATE_NAME
+               DATE_FORMAT(MAX(DATE_ID), '%Y.%m.%d') AS DATE_NAME
         FROM
             fact_issue_agency_daily fiad
         WHERE DEL_FLAG = '0'

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java

@@ -3,8 +3,10 @@ package com.epmet;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.scheduling.annotation.EnableAsync;
 
 @SpringBootApplication (exclude = {DataSourceAutoConfiguration.class})
+@EnableAsync
 public class DataStatsApplication {
 
     public static void main(String[] args) {