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

zhubaomin

3 天以前 d730e2a289b38356e28a04b35a0cb2e7b4c6c282

 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()) ;
@@ -58,8 +61,10 @@
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoWeather>>> oneHistory(Long weatherId){
        try {

            return BaseResponseUtils.buildSuccess(sv.oneHistory(weatherId));
            if(weatherId == null){
                return BaseResponseUtils.buildFail("气象站id不能为空") ;
            }
           return BaseResponseUtils.buildSuccess(sv.oneHistory(weatherId));
        } catch (Exception e) {
            return BaseResponseUtils.buildException(e.getMessage()) ;
        }