From fae4bd828a6b81b95f53e285fcb4749fbd80c7bf Mon Sep 17 00:00:00 2001 From: CZT <czt18638530771@163.com> Date: 星期一, 04 九月 2023 17:31:46 +0800 Subject: [PATCH] 增加粮情层行转换配置 --- igds-core/src/main/java/com/ld/igds/common/manager/CommonManager.java | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/igds-core/src/main/java/com/ld/igds/common/manager/CommonManager.java b/igds-core/src/main/java/com/ld/igds/common/manager/CommonManager.java index 0eda84d..68dee3b 100644 --- a/igds-core/src/main/java/com/ld/igds/common/manager/CommonManager.java +++ b/igds-core/src/main/java/com/ld/igds/common/manager/CommonManager.java @@ -14,7 +14,6 @@ import com.ld.igds.data.SimpleDepot; import com.ld.igds.grain.dto.GrainData; import com.ld.igds.grain.service.CoreGrainService; -import com.ld.igds.inout.dto.InoutParam; import com.ld.igds.models.*; import com.ld.igds.sys.service.DicTriggerService; import com.ld.igds.sys.service.SysDeptService; @@ -26,13 +25,16 @@ import com.ld.igds.warn.data.WarnParam; import com.ld.igds.warn.service.CoreWarnService; import com.ld.igds.weather.CoreWeatherService; + import lombok.extern.slf4j.Slf4j; + import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; + import java.util.*; import java.util.stream.Collectors; @@ -63,6 +65,7 @@ private CoreWarnService coreWarnService; @Resource private RedisUtil redisUtil; + /** * 鑾峰彇鍏ュ簱浣滀笟涓紝浠撳簱涓嬫媺妗嗭紝鍊艰幏鍙栫姸鎬�=闈炴弧浠撶殑绮簱 @@ -559,8 +562,9 @@ log.debug("----------------鏍规嵁鐢ㄦ埛IP鑾峰彇閫夋嫨-鍦扮----{}", userIp); String key = "INOUT:WEIGHT:" + userIp; - - return (String) redisUtil.get(key); + String sort = (String)redisUtil.get(key); + if(StringUtils.isEmpty(sort))sort="1"; + return sort; } /** @@ -605,5 +609,15 @@ return (String) redisUtil.get(key); } + public Page<DicArea> pageDicArea(BaseParam param) { + + Page<DicArea> page = new Page<>(param.getPage(), param.getLimit()); + + List<DicArea> list = coreDicService.listDicArea(page, param); + page.setRecords(list); + + return page; + } + } -- Gitblit v1.9.3