pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java

@@ -138,7 +138,7 @@
     * å·²ç»ç”Ÿæˆæ—¶é•¿ï¼ˆå¤©ï¼‰
     */
    public Integer lifeLen;
    /**
     /**
     * å½“前生长阶段
     */
    public String lifeCur ;
@@ -150,5 +150,17 @@
     * æ˜¯å¦åœæ­¢è®¡ç®—，1是，0否
     */
    public String stoppedStr;
    /**
     * å·²ç»ç”Ÿæˆæ—¶é•¿ï¼ˆå¤©ï¼‰
     */
    public String lifeLenStr;

    /**
     * å¯¹åº”作物生长阶段的系数
     */
    public String lifeFactorStr ;

    //关联气象站名称
    public String weatherName ;

}

 pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsCtrl.java

@@ -128,17 +128,12 @@
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
        int count;
        int count = 0 ;
        try {
            po.id = null ;
            po.createDt = new Date();
            po.deleted = 0 ;
            if(po.life4End != null && po.startDt != null && !po.startDt.trim().equals("")){
                String nowYear = DateTime.yyyy() ;
                String startDt = nowYear + "-" + po.startDt ;
                String endDt = DateTime.nextXDay_yyyy_MM_dd(startDt, po.life4End) ;
                po.endDt = endDt.substring(5, 10) ;
            }
            this.setLifeEnd(po);
            count = this.sv.save(po);
        } catch (Exception e) {
            log.error("保存作物异常", e);
@@ -173,10 +168,11 @@
        if(po.id == null){
            return BaseResponseUtils.buildFail("无数据实体ID") ;
        }
        po.createDt = null ;
        po.deleted = null ;
        int count;
        int count = 0;
        try {
            po.createDt = null ;
            po.deleted = null ;
            this.setLifeEnd(po);
            count = this.sv.update(po);
        } catch (Exception e) {
            log.error("保存作物异常", e);
@@ -223,4 +219,13 @@
            return BaseResponseUtils.buildSuccess(true) ;
        }
    }

    private void setLifeEnd(MdCrops po) throws Exception{
        if(po.life4End != null && po.startDt != null && !po.startDt.trim().equals("")){
            String nowYear = DateTime.yyyy() ;
            String startDt = nowYear + "-" + po.startDt ;
            String endDt = DateTime.nextXDay_yyyy_MM_dd(startDt, po.life4End) ;
            po.endDt = endDt.substring(5, 10) ;
        }
    }
}

 pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsSv.java

@@ -1,9 +1,12 @@
package com.dy.pipIrrModel.crops;

import com.dy.common.util.DateTime;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoMd.MdCropsMapper;
import com.dy.pipIrrGlobal.daoPr.PrStWeatherMapper;
import com.dy.pipIrrGlobal.pojoMd.MdCrops;
import com.dy.pipIrrGlobal.voMd.VoCrops;
import com.dy.pipIrrGlobal.voPr.VoWeather;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,9 +26,13 @@
public class CropsSv {

    private MdCropsMapper mdCropsDao ;
    private PrStWeatherMapper prStWeatherDao;

    @Autowired
    private void setDao(MdCropsMapper dao) { this.mdCropsDao = dao; }
    private void setDao(MdCropsMapper mdCropsDao, PrStWeatherMapper prStWeatherDao) {
        this.mdCropsDao = mdCropsDao;
        this.prStWeatherDao = prStWeatherDao;
    }

    /**
     * å¾—到一个实体
@@ -36,6 +43,13 @@
        VoCrops vo = this.mdCropsDao.selectById(id) ;
        if(vo != null){
            this.setStoppedStr(vo) ;
            this.setLife(vo) ;
            if(vo.weatherId != null){
                VoWeather wVo = this.prStWeatherDao.selectOne(vo.weatherId) ;
                if(wVo != null){
                    vo.weatherName = wVo.getName() ;
                }
            }
        }
        return vo ;
    }
@@ -58,6 +72,7 @@
        if(list != null && list.size() > 0){
            for(VoCrops vo : list){
                this.setStoppedStr(vo) ;
                this.setLife(vo) ;
            }
        }
        rsVo.obj = list ;
@@ -74,6 +89,7 @@
        if(list != null && list.size() > 0){
            for(VoCrops vo : list){
                this.setStoppedStr(vo) ;
                this.setLife(vo) ;
            }
        }
        return list ;
@@ -115,5 +131,62 @@
            vo.stoppedStr = "" ;
        }
    }
    private void setLife(VoCrops vo){
        vo.lifeLenStr = "--" ;
        vo.lifeCur = "--" ;
        vo.lifeFactorStr = "--" ;
        try{
            if(vo.startDt != null && vo.endDt != null){
                String start = DateTime.yyyy() + "-" + vo.startDt ;
                String now = DateTime.yyyy_MM_dd() ;
                Long days = DateTime.daysBetweenyyyy_MM_dd(now, start) ;
                if(days > 0){
                    vo.lifeLen = days.intValue() ;
                    vo.lifeLenStr = "" + days + "天" ;
                    if(vo.life4Start != null && vo.life4End != null){
                        if(days >= vo.life4Start && days <= vo.life4End){
                            vo.lifeCur = "生长末期" ;
                            vo.lifeFactor = vo.life4Factor ;
                            vo.lifeFactorStr = "" + vo.lifeFactor ;
                        }
                        if(days > vo.life4End){
                            vo.lifeCur = "已结束" ;
                            vo.lifeLenStr = "--" ;
                        }
                    }
                    if(vo.life3Start != null && vo.life3End != null){
                        if(days >= vo.life3Start && days <= vo.life3End){
                            vo.lifeCur = "生长中期" ;
                            vo.lifeFactor = vo.life3Factor ;
                            vo.lifeFactorStr = "" + vo.lifeFactor ;
                        }
                    }
                    if(vo.life2Start != null && vo.life2End != null){
                        if(days >= vo.life2Start && days <= vo.life2End){
                            vo.lifeCur = "快速生长期" ;
                            vo.lifeFactor = vo.life2Factor ;
                            vo.lifeFactorStr = "" + vo.lifeFactor ;
                        }
                    }
                    if(vo.life1Start != null && vo.life1End != null){
                        if(days >= vo.life1Start && days <= vo.life1End){
                            vo.lifeCur = "生长初期" ;
                            vo.lifeFactor = vo.life1Factor ;
                            vo.lifeFactorStr = "" + vo.lifeFactor ;
                        }
                        if(days < vo.life1Start){
                            vo.lifeCur = "未开始" ;
                            vo.lifeLenStr = "--" ;
                        }
                    }
                }else{
                    vo.lifeCur = "未开始" ;
                    vo.lifeLenStr = "--" ;
                }
            }
        }catch (Exception e){
            log.error("计算作物生命周期失败", e) ;
        }
    }

}

 pipIrr-platform/Îĵµ/º«Ô²úÆ·Éè¼Æ.txt

New file
@@ -0,0 +1 @@
https://js.design/f/RobkAZ?p=2F_hFprDdh&mode=design