From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期四, 17 四月 2025 14:22:59 +0800 Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划,是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。 --- pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/dict/DictSv.java | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/dict/DictSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/dict/DictSv.java index 0f6e424..b9211bf 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/dict/DictSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/dict/DictSv.java @@ -1,11 +1,14 @@ package com.dy.pipIrrBase.dict; import com.dy.pipIrrGlobal.daoBa.BaDictItemMapper; +import com.dy.pipIrrGlobal.daoBa.BaSettingsMapper; import com.dy.pipIrrGlobal.voBa.VoDictItem; +import com.dy.pipIrrGlobal.voBa.VoMapCenter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -23,6 +26,9 @@ @Autowired private BaDictItemMapper dictItemMapper; + @Autowired + private BaSettingsMapper baSettingsMapper; + /** * 鏍规嵁瀛楀吀Code鑾峰彇瀛楀吀椤� * @param dictCode @@ -32,4 +38,32 @@ List<VoDictItem> rs = Optional.ofNullable(dictItemMapper.getDictItemsByDictCode(dictCode)).orElse(new ArrayList<>()); return rs ; } + + /** + * 鏍规嵁閰嶇疆椤瑰悕绉拌幏鍙栭厤缃」鍊� + * @param itemName + * @return + */ + public String getItemValue(String itemName) { + return baSettingsMapper.getItemValue(itemName); + } + + /** + * 鑾峰彇鍦板浘涓績鍧愭爣 + * @return + */ + public VoMapCenter getMapCenter() { + BigDecimal lat = new BigDecimal(baSettingsMapper.getItemValue("lat")); + BigDecimal lng = new BigDecimal(baSettingsMapper.getItemValue("lng")); + + Integer zoomMp = Integer.parseInt(Optional.ofNullable(baSettingsMapper.getItemValue("zoomMp")).orElse("0")); + Integer zoomPc = Integer.parseInt(Optional.ofNullable(baSettingsMapper.getItemValue("zoomPc")).orElse("0")); + + VoMapCenter po = new VoMapCenter(); + po.setLat(lat); + po.setLng(lng); + po.setZoomMp(zoomMp); + po.setZoomPc(zoomPc); + return po; + } } -- Gitblit v1.8.0