diff --git a/src/main/java/com/cuit/solarenergy/controller/DataController.java b/src/main/java/com/cuit/solarenergy/controller/DataController.java index f3872dc..cccde2a 100644 --- a/src/main/java/com/cuit/solarenergy/controller/DataController.java +++ b/src/main/java/com/cuit/solarenergy/controller/DataController.java @@ -193,7 +193,7 @@ public class DataController { return RetResponse.makeErrRsp("查询数据失败!"+e.getMessage()); } } - @AopLog + @AopLog @AuthToken @ApiOperation("7、监测排序") @PreAuthorize("hasAuthority('minio:upload')") @@ -237,7 +237,7 @@ public class DataController { return RetResponse.makeErrRsp("获取当前时间失败!"+e.getMessage()); } } - @AopLog + @AopLog @AuthToken @ApiOperation("10、获取要素状态") @PreAuthorize("hasAuthority('minio:upload')") diff --git a/src/main/java/com/cuit/solarenergy/mapper/TSamplingDataDetailsMapper.java b/src/main/java/com/cuit/solarenergy/mapper/TSamplingDataDetailsMapper.java index 52a4f99..656fb92 100644 --- a/src/main/java/com/cuit/solarenergy/mapper/TSamplingDataDetailsMapper.java +++ b/src/main/java/com/cuit/solarenergy/mapper/TSamplingDataDetailsMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cuit.solarenergy.entity.ElementValue; import com.cuit.solarenergy.entity.MapService; +import com.cuit.solarenergy.entity.MonitorRet; import com.cuit.solarenergy.entity.TSamplingDataDetails; import com.cuit.solarenergy.entity.vo.req.MultiRSDetectionReq; import com.cuit.solarenergy.entity.vo.req.MultiRSReq; @@ -120,6 +121,12 @@ public interface TSamplingDataDetailsMapper extends BaseMapper getElementStatus(String mappedElementCode); + + /** + * 查询监测点信息 + * @return + */ + List getMonitorInfo(); } diff --git a/src/main/resources/mapper/TSamplingDataDetailsMapper.xml b/src/main/resources/mapper/TSamplingDataDetailsMapper.xml index edaa01b..1df598e 100644 --- a/src/main/resources/mapper/TSamplingDataDetailsMapper.xml +++ b/src/main/resources/mapper/TSamplingDataDetailsMapper.xml @@ -385,6 +385,17 @@ FROM radi_chn_mul_hor +