Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

2025-07-08 e3270141db2dd6c755e6a7b40930dcfa24585cb4

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/weather/WeatherCtrl.java

@@ -43,6 +43,9 @@
    @SsoAop()
    public BaseResponse<VoWeather> oneLast(Long weatherId){
        try {
            if(weatherId == null){
                return BaseResponseUtils.buildFail("气象站id不能为空") ;
            }
            return BaseResponseUtils.buildSuccess(sv.oneLast(weatherId));
        } catch (Exception e) {
            return BaseResponseUtils.buildException(e.getMessage()) ;
@@ -51,15 +54,18 @@

    /**
     * 根据指定条件查询历史记录
     * @param weatherId
     * @param qo
     * @return
     */
    @GetMapping(path = "oneHistory")
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoWeather>>> oneHistory(Long weatherId){
    public BaseResponse<QueryResultVo<List<VoWeather>>> oneHistory(WeatherQo qo){
        try {

            return BaseResponseUtils.buildSuccess(sv.oneHistory(weatherId));
            if(qo.weatherId == null){
                return BaseResponseUtils.buildFail("气象站id不能为空") ;
            }
            qo.completionTime();
           return BaseResponseUtils.buildSuccess(sv.oneHistory(qo));
        } catch (Exception e) {
            return BaseResponseUtils.buildException(e.getMessage()) ;
        }
@@ -74,6 +80,7 @@
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoWeather>>> someLast(WeatherQo qo){
        try {
            qo.completionTime();
            return BaseResponseUtils.buildSuccess(sv.someLast(qo));
        } catch (Exception e) {
            return BaseResponseUtils.buildException(e.getMessage()) ;
@@ -89,6 +96,7 @@
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoWeather>>> someHistory(WeatherQo qo){
        try {
            qo.completionTime();
            return BaseResponseUtils.buildSuccess(sv.someHistory(qo));
        } catch (Exception e) {
            return BaseResponseUtils.buildException(e.getMessage()) ;