From bd83bbea42f7f8e40153dbe260cc06a78ac32d9c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 26 Dec 2022 15:16:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=96=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/HistoryScoreResultDTO.java | 28 +++++++++++++++++++ .../index/IndexExplainController.java | 10 +++++++ .../index/IndexExplainDao.java | 3 ++ .../index/IndexExplainService.java | 3 ++ .../index/impl/IndexExplainServiceImpl.java | 6 ++++ .../mapper/index/IndexExplainDao.xml | 15 ++++++++++ 6 files changed, 65 insertions(+) create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/HistoryScoreResultDTO.java diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/HistoryScoreResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/HistoryScoreResultDTO.java new file mode 100644 index 0000000000..54c196cff8 --- /dev/null +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/HistoryScoreResultDTO.java @@ -0,0 +1,28 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class HistoryScoreResultDTO implements Serializable { + private static final long serialVersionUID = -4316054054019675419L; + + /** + * id + */ + private String id; + /** + * 标题 + */ + private String title; + /** + * 起始时间 + */ + private String startTime; + /** + * 截止时间 + */ + private String endTime; + +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/index/IndexExplainController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/index/IndexExplainController.java index 89e1c94860..86c7b2e3c5 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/index/IndexExplainController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/index/IndexExplainController.java @@ -23,6 +23,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.datareport.service.evaluationindex.index.IndexExplainService; import com.epmet.dto.form.HistoryScoreListFormDTO; import com.epmet.dto.result.HistoryScoreDetailResultDTO; +import com.epmet.dto.result.HistoryScoreResultDTO; import com.epmet.evaluationindex.index.form.IndexExplainFormDTO; import com.epmet.evaluationindex.index.form.IndexScoreFormDTO; import com.epmet.evaluationindex.index.result.IndexExplainResult; @@ -86,4 +87,13 @@ public class IndexExplainController { return new Result>().ok(indexExplainService.dplist(formDTO)); } + /** + * 获取最近一条记录数据信息 + * @return + */ + @RequestMapping("firsthistoryscore") + public Result firstHistoryScore() { + return new Result().ok(indexExplainService.firstHistoryScore()); + } + } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/index/IndexExplainDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/index/IndexExplainDao.java index 25ea956679..d5c2e683f5 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/index/IndexExplainDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/index/IndexExplainDao.java @@ -19,6 +19,7 @@ package com.epmet.datareport.dao.evaluationindex.index; import com.epmet.dto.form.HistoryScoreListFormDTO; import com.epmet.dto.result.HistoryScoreDetailResultDTO; +import com.epmet.dto.result.HistoryScoreResultDTO; import com.epmet.evaluationindex.index.dto.IndexExplainTreeDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -37,4 +38,6 @@ public interface IndexExplainDao { List getIndexExplainTreeByOrgType(@Param("orgLevel") String orgLevel); List selectDpList(HistoryScoreListFormDTO formDTO); + + HistoryScoreResultDTO firstHistoryScore(); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/IndexExplainService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/IndexExplainService.java index 3e6510f853..3106fc573b 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/IndexExplainService.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/IndexExplainService.java @@ -19,6 +19,7 @@ package com.epmet.datareport.service.evaluationindex.index; import com.epmet.dto.form.HistoryScoreListFormDTO; import com.epmet.dto.result.HistoryScoreDetailResultDTO; +import com.epmet.dto.result.HistoryScoreResultDTO; import com.epmet.evaluationindex.index.form.IndexExplainFormDTO; import com.epmet.evaluationindex.index.form.IndexScoreFormDTO; import com.epmet.evaluationindex.index.result.IndexExplainResult; @@ -55,4 +56,6 @@ public interface IndexExplainService { IndexDictResultDTO getIndexMeaning(IndexScoreFormDTO formDTO); List dplist(HistoryScoreListFormDTO formDTO); + + HistoryScoreResultDTO firstHistoryScore(); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java index b4a69d462b..910424c541 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java @@ -31,6 +31,7 @@ import com.epmet.datareport.dao.fact.*; import com.epmet.datareport.service.evaluationindex.index.IndexExplainService; import com.epmet.dto.form.HistoryScoreListFormDTO; import com.epmet.dto.result.HistoryScoreDetailResultDTO; +import com.epmet.dto.result.HistoryScoreResultDTO; import com.epmet.evaluationindex.index.dto.IndexExplainTreeDTO; import com.epmet.evaluationindex.index.form.IndexExplainFormDTO; import com.epmet.evaluationindex.index.form.IndexScoreFormDTO; @@ -466,4 +467,9 @@ public class IndexExplainServiceImpl implements IndexExplainService { } + @Override + public HistoryScoreResultDTO firstHistoryScore() { + return indexExplainDao.firstHistoryScore(); + } + } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexExplainDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexExplainDao.xml index 1fe95e6eaf..057c365b5b 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexExplainDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/index/IndexExplainDao.xml @@ -66,4 +66,19 @@ avg(b.nldf) DESC, b.agency_name ASC + +