前端系统开发部署后，结合真实设备数据，进行测试，修改发现的bug.

liurunyu

5 天以前 2929692585407909e95676b0651a9310bb228f48

前端系统开发部署后，结合真实设备数据，进行测试，修改发现的bug.

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoWeather.java

@@ -122,8 +122,7 @@
     西北（NW）    146°~169°     157.5°
     北（N）        169°~191°     180°
     */
    @Schema(description = "风向", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    public String windDirectionStr;
    @JSONField(name = "windDirectionStr") // 指定 JSON 中的字段名
    public String getWindDirectionStr() {
        String str = "" ;
        if (windDirection != null) {

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/manure/ManureCtrl.java

@@ -54,17 +54,18 @@

    /**
     * 根据指定条件查询历史记录
     * @param manureId
     * @param qo
     * @return
     */
    @GetMapping(path = "oneHistory")
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoManure>>> oneHistory(Long manureId){
    public BaseResponse<QueryResultVo<List<VoManure>>> oneHistory(ManureQo qo){
        try {
            if(manureId == null){
            if(qo.manureId == null){
                return BaseResponseUtils.buildFail("水肥机id不能为空") ;
            }
            return BaseResponseUtils.buildSuccess(sv.oneHistory(manureId));
            qo.completionTime();
            return BaseResponseUtils.buildSuccess(sv.oneHistory(qo));
        } catch (Exception e) {
            return BaseResponseUtils.buildException(e.getMessage()) ;
        }
@@ -79,6 +80,7 @@
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoManure>>> someLast(ManureQo qo){
        try {
            qo.completionTime();
            return BaseResponseUtils.buildSuccess(sv.someLast(qo));
        } catch (Exception e) {
            return BaseResponseUtils.buildException(e.getMessage()) ;
@@ -94,6 +96,7 @@
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoManure>>> someHistory(ManureQo qo){
        try {
            qo.completionTime();
            return BaseResponseUtils.buildSuccess(sv.someHistory(qo));
        } catch (Exception e) {
            return BaseResponseUtils.buildException(e.getMessage()) ;

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/manure/ManureSv.java

@@ -36,9 +36,7 @@
        return null ;
    }

    public QueryResultVo<List<VoManure>> oneHistory(Long manureId) {
        ManureQo qo = new ManureQo() ;
        qo.manureId = manureId ;
    public QueryResultVo<List<VoManure>> oneHistory(ManureQo qo) {
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmManureHistoryDao.selectCount(params);


 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/soil/SoilCtrl.java

@@ -104,6 +104,7 @@
            if(qo.soilId == null){
                return BaseResponseUtils.buildFail("墒情站id不能为空") ;
            }
            qo.completionTime();
            return BaseResponseUtils.buildSuccess(sv.someDay(qo));
        } catch (Exception e) {
            return BaseResponseUtils.buildException(e.getMessage()) ;
@@ -142,15 +143,18 @@

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

            return BaseResponseUtils.buildSuccess(sv.oneHistory(soilId));
            if(qo.soilId == null){
                return BaseResponseUtils.buildFail("墒情站id不能为空") ;
            }
            qo.completionTime();
            return BaseResponseUtils.buildSuccess(sv.oneHistory(qo));
        } catch (Exception e) {
            return BaseResponseUtils.buildException(e.getMessage()) ;
        }
@@ -166,6 +170,7 @@
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoSoil>>> someLast(SoilQo qo){
        try {
            qo.completionTime();
            return BaseResponseUtils.buildSuccess(sv.someLast(qo));
        } catch (Exception e) {
            return BaseResponseUtils.buildException(e.getMessage()) ;
@@ -181,6 +186,7 @@
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoSoil>>> someHistory(SoilQo qo){
        try {
            qo.completionTime();
            return BaseResponseUtils.buildSuccess(sv.someHistory(qo));
        } catch (Exception e) {
            return BaseResponseUtils.buildException(e.getMessage()) ;

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/soil/SoilSv.java

@@ -69,9 +69,7 @@
        return null ;
    }

    public QueryResultVo<List<VoSoil>> oneHistory(Long soilId) {
        SoilQo qo = new SoilQo() ;
        qo.soilId = soilId ;
    public QueryResultVo<List<VoSoil>> oneHistory(SoilQo qo) {
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmSoilHistoryDao.selectCount(params);


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

@@ -54,17 +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 {
            if(weatherId == null){
            if(qo.weatherId == null){
                return BaseResponseUtils.buildFail("气象站id不能为空") ;
            }
           return BaseResponseUtils.buildSuccess(sv.oneHistory(weatherId));
            qo.completionTime();
           return BaseResponseUtils.buildSuccess(sv.oneHistory(qo));
        } catch (Exception e) {
            return BaseResponseUtils.buildException(e.getMessage()) ;
        }
@@ -79,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()) ;
@@ -94,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()) ;

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

@@ -36,9 +36,7 @@
        return null ;
    }

    public QueryResultVo<List<VoWeather>> oneHistory(Long weatherId) {
        WeatherQo qo = new WeatherQo() ;
        qo.weatherId = weatherId ;
    public QueryResultVo<List<VoWeather>> oneHistory(WeatherQo qo) {
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmWeatherHistoryDao.selectCount(params);