pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/modelCalculate/Hargreaves.java
@@ -108,7 +108,7 @@ * @return */ public static Double ET0(Double kc, Double maxT, Double minT, Double zenithRadiation){ Expression expression = new ExpressionBuilder("x * (0.0023 * (((a + b) / 2) + 17.8) * ((a + b)^(1/2)) * c * 0.408)") Expression expression = new ExpressionBuilder("x * (0.0023 * (((a + b) / 2) + 17.8) * ((a - b)^(1/2)) * c * 0.408)") .variables("x", "a", "b", "c") .build(); // 设置åéå¼ pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/PipIrrWechatApplication.java
@@ -25,7 +25,8 @@ "com.dy.pipIrrGlobal.daoBa", "com.dy.pipIrrGlobal.daoFi", "com.dy.pipIrrGlobal.daoIr", "com.dy.pipIrrGlobal.daoVi" "com.dy.pipIrrGlobal.daoVi", "com.dy.pipIrrGlobal.daoMd" }) public class PipIrrWechatApplication { pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/vapor/VaporCtrl.java
New file @@ -0,0 +1,80 @@ package com.dy.pipIrrWechat.vapor; import com.dy.common.util.DateTime; import com.dy.common.webUtil.BaseResponse; import com.dy.common.webUtil.BaseResponseUtils; import com.dy.pipIrrGlobal.pojoMd.MdEt0; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; /** * @Author: liurunyu * @Date: 2025/8/19 16:21 * @Description */ @Slf4j @Tag(name = "ä½ç©æ¥è¸è ¾é", description = "ä½ç©æ¥è¸è ¾éæ¥è¯¢çæä½") @RestController @RequestMapping(path = "mdVapor") public class VaporCtrl { private VaporSv sv; @Autowired private void setSv(VaporSv sv) { this.sv = sv; } /** * 客æ·ç«¯è¯·æ±å¾å°ææä½ç©çæ¨æ¥è¸è ¾é * @return ææææä½ç©çæ¨æ¥è¸è ¾é */ @GetMapping(path = "allCropsWithYesterday") public BaseResponse<List<MdEt0>> allYesterday(){ try { String ymd = DateTime.yesterday_yyyy_MM_dd( Integer.parseInt(DateTime.yyyy()), Integer.parseInt(DateTime.MM()), Integer.parseInt(DateTime.dd())) ; List<MdEt0> res = this.sv.selectEt0(ymd) ; return BaseResponseUtils.buildSuccess(res); } catch (Exception e) { log.error("æ¥è¯¢ææä½ç©çæ¨æ¥è¸è ¾éå¼å¸¸", e); return BaseResponseUtils.buildException(e.getMessage()) ; } } /** * æ ¹æ®æå®æ¡ä»¶ä½ç©æ¥è¯¢ä¸æ®µæ¶é´å çè¸è ¾é * @param qo * @return */ @GetMapping(path = "oneCropsSomeEt0") public BaseResponse<List<MdEt0>> oneCropsSomeEt0(VaporQo qo){ try { if(qo.cropId == null){ return BaseResponseUtils.buildFail("ä½ç©idä¸è½ä¸ºç©º") ; } if(qo.timeStop == null || qo.timeStop.trim().equals("")){ qo.timeStop = DateTime.yyyy_MM_dd() ; } if(qo.timeStart == null || qo.timeStart.trim().equals("")){ qo.timeStart = DateTime.lastXDay_yyyy_MM_dd(qo.timeStop, 10); } List<MdEt0> list = sv.oneCropsSomeEt0(qo) ; if(list == null){ list = new ArrayList<>() ; } return BaseResponseUtils.buildSuccess(list); } catch (Exception e) { return BaseResponseUtils.buildException(e.getMessage()) ; } } } pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/vapor/VaporQo.java
New file @@ -0,0 +1,37 @@ package com.dy.pipIrrWechat.vapor; import com.dy.common.webUtil.QueryConditionVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; /** * @Author: liurunyu * @Date: 2025/8/19 16:21 * @Description */ @Data @EqualsAndHashCode(callSuper = false) @ToString(callSuper = true) @NoArgsConstructor @AllArgsConstructor @Builder public class VaporQo extends QueryConditionVo { /** * ä½ç©ID */ @Schema(description = "ä½ç©ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED) public Long cropId; /** * æ¥è¯¢å¼å§æ¥æ */ @Schema(description = "æ¥è¯¢å¼å§æ¥æ", requiredMode = Schema.RequiredMode.NOT_REQUIRED) public String timeStart; /** * æ¥è¯¢ç»ææ¥æ */ @Schema(description = "æ¥è¯¢ç»ææ¥æ", requiredMode = Schema.RequiredMode.NOT_REQUIRED) public String timeStop; } pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/vapor/VaporSv.java
New file @@ -0,0 +1,40 @@ package com.dy.pipIrrWechat.vapor; import com.dy.pipIrrGlobal.daoMd.MdEt0Mapper; import com.dy.pipIrrGlobal.pojoMd.MdEt0; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.common.utils.PojoUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; import java.util.Map; /** * @Author: liurunyu * @Date: 2025/8/19 16:21 * @Description */ @Slf4j @Service public class VaporSv { private MdEt0Mapper mdEt0Dao; @Autowired private void setDao( MdEt0Mapper mdEt0Dao) { this.mdEt0Dao = mdEt0Dao; } public List<MdEt0> selectEt0(String ymd){ return mdEt0Dao.selectEt0ByDt(ymd); } public List<MdEt0> oneCropsSomeEt0(VaporQo qo){ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo); return mdEt0Dao.selectEt0ByCropAndDt(params); } } pipIrr-platform/Îĵµ/ÕôÉ¢Á¿¼ÆË㹫ʽ/ÕôÉ¢Á¿¼ÆË㹫ʽ¼ò»¯°æ.docxBinary files differ
pipIrr-platform/Îĵµ/ÕôÉ¢Á¿¼ÆË㹫ʽ/ÕôÉ¢Á¿¼ÆË㹫ʽ¼ò»¯°æ.xlsxBinary files differ