diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java index d23d021799..2db20b4501 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java @@ -117,6 +117,15 @@ public class DateUtils { return new Date[]{beginDate, endDate}; } + /** + * 根据日期,获取周开始日期、结束日期 + * @param date + * @return + */ + public static Date[] getWeekStartAndEnd(Date date) { + return getWeekStartAndEnd(getWeekOfYear(date)); + } + /** * 对日期的【秒】进行加/减 * diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/DemoIssueService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/DemoIssueService.java deleted file mode 100644 index bf6e62fe3f..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/DemoIssueService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.epmet.service.Issue; - -import com.epmet.entity.issue.IssueEntity; - -import java.util.List; - -public interface DemoIssueService { - - List listAllEntities(); -} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/DemoIssueServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/DemoIssueServiceImpl.java deleted file mode 100644 index 423e9fc91f..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/DemoIssueServiceImpl.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.epmet.service.Issue.impl; - -import com.epmet.commons.dynamic.datasource.annotation.DataSource; -import com.epmet.constant.DataSourceConstant; -import com.epmet.dao.issue.StatsIssueDao; -import com.epmet.entity.issue.IssueEntity; -import com.epmet.service.Issue.DemoIssueService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - - -@Service -@DataSource(DataSourceConstant.GOV_ISSUE) -public class DemoIssueServiceImpl implements DemoIssueService { - - @Autowired - private StatsIssueDao statsIssueDao; - - @Override - public List listAllEntities() { - return statsIssueDao.listAllEntities(); - } -}