From 9dcc346205e2c96b28f2f561f439a29bc6c2a6dc Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 16 四月 2026 15:34:06 +0800
Subject: [PATCH] 仅七天玉米价格，添加默认从粮食单价获取
---
fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java | 25 ++++++++++++
fzzy-igdss-view/src/main/java/com/fzzy/igds/FoodPricePR.java | 2
fzzy-igdss-web/src/main/resources/templates/main.html | 70 +++++++++++++++++++---------------
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FoodPriceService.java | 23 +++++++++--
4 files changed, 82 insertions(+), 38 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FoodPriceService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FoodPriceService.java
index a00bc2d..500a5aa 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FoodPriceService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FoodPriceService.java
@@ -2,10 +2,12 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fzzy.igds.constant.Constant;
+import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.FoodPrice;
import com.fzzy.igds.mapper.FoodPriceMapper;
import com.fzzy.igds.timer.JobWarnService;
import com.fzzy.igds.utils.ContextUtil;
+import com.fzzy.igds.utils.DateUtil;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
@@ -34,22 +36,32 @@
*
* @return
*/
- public List<FoodPrice> listData() {
+ public List<FoodPrice> listData(IgdsBaseParam param) {
+ if(null == param){
+ param = new IgdsBaseParam();
+ }
SysUser user = ContextUtil.getLoginUser();
-
QueryWrapper<FoodPrice> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("company_id", user.getCompanyId());
-
//閾惰鐢ㄦ埛鏌ヨ褰撳墠閾惰鐨勫崟浠烽厤缃�
if (Constant.USER_TYPE_30.equals(user.getUserType())) {
queryWrapper.likeRight("bank_id", user.getUserData());
+ }
+ if(StringUtils.isNotBlank(param.getKey())){
+ queryWrapper.eq("food_variety", param.getKey());
+ }
+ if (null != param.getStart()) {
+ queryWrapper.ge("create_time", DateUtil.getCurZero(param.getStart()));
+ }
+ if (null != param.getEnd()) {
+ queryWrapper.le("create_time", DateUtil.getNextZero(param.getEnd()));
}
return foodPriceMapper.selectList(queryWrapper);
}
/**
- * 鏍规嵁閾惰鍙婂搧绉嶏紝鏌ヨ鍗曚环淇℃伅
+ * 鏍规嵁閾惰鍙婂搧绉嶏紝鏌ヨ鍗曚环淇℃伅锛岃幏鍙栧惎鐢ㄧ殑锛屾渶鏂扮殑涓�鏉�
* @param bankId
* @param foodVariety
* @return
@@ -62,7 +74,8 @@
QueryWrapper<FoodPrice> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("bank_id", bankId);
queryWrapper.eq("food_variety", foodVariety);
-
+ queryWrapper.eq("vld", Constant.YN_Y);
+ queryWrapper.orderByDesc("create_time","id");
List<FoodPrice> foodPrices = foodPriceMapper.selectList(queryWrapper);
if(null == foodPrices){
return null;
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/FoodPricePR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/FoodPricePR.java
index 3403723..7a46b97 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/FoodPricePR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/FoodPricePR.java
@@ -32,7 +32,7 @@
*/
@DataProvider
public List<FoodPrice> getList() {
- return foodPriceService.listData();
+ return foodPriceService.listData(null);
}
/**
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java
index bc79e57..c8460e6 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java
@@ -61,6 +61,9 @@
@Resource
private GatewaySerService gatewaySerService;
+ @Resource
+ private FoodPriceService foodPriceService;
+
/**
* 鏍规嵁搴撳尯缂栫爜鑾峰彇搴撳尯缃戝叧淇℃伅
*
@@ -306,6 +309,27 @@
}
//杩戜竷澶╃帀绫冲嚭搴撲环鏍肩粺璁�
+ //1.榛樿浠庣伯椋熷崟浠蜂腑鑾峰彇
+ IgdsBaseParam paramOfFoodPrice = new IgdsBaseParam();
+ //绮鍝佺鐜夌背
+ paramOfFoodPrice.setKey("1120000");
+ paramOfFoodPrice.setStart(DateUtil.getNewByDay(new Date(), -6));
+ paramOfFoodPrice.setEnd(new Date());
+ List<FoodPrice> foodPrices = foodPriceService.listData(paramOfFoodPrice);
+ if (null != foodPrices && !foodPrices.isEmpty()) {
+ for (FoodPrice record : foodPrices) {
+ key = DateFormatUtils.format(record.getCreateTime(), "MM-dd");
+ if (null != mapWeekMaizeNum.get(key)) {
+ Double nowPrice = mapWeekMaizeNum.get(key);
+ Double newPrice = record.getPrice();
+ if (nowPrice > newPrice || nowPrice == 0) {
+ nowPrice = newPrice;
+ }
+ mapWeekMaizeNum.put(key, nowPrice);
+ }
+ }
+ }
+ //2.鏌ヨ鍑哄叆搴撶殑鍗曚环锛屾湁鍑哄簱鐨勮瘽锛岀敤鍑哄簱鍗曚环鏇挎崲绮鍗曚环
InoutParam inoutParamOfMaize = new InoutParam();
inoutParamOfMaize.setDeptId(user.getDeptId() + "");
//绮鍝佺鐜夌背
@@ -324,7 +348,6 @@
nowPrice = newPrice;
}
mapWeekMaizeNum.put(key, nowPrice);
-
}
}
}
diff --git a/fzzy-igdss-web/src/main/resources/templates/main.html b/fzzy-igdss-web/src/main/resources/templates/main.html
index 6df4ffa..8ae77d8 100644
--- a/fzzy-igdss-web/src/main/resources/templates/main.html
+++ b/fzzy-igdss-web/src/main/resources/templates/main.html
@@ -129,16 +129,24 @@
<!-- 缁熻鍥捐〃 -->
<div class="layui-row layui-col-space15">
- <div class="layui-col-md4 layui-col-sm6">
- <div class="layui-card" style="overflow: hidden;">
- <div class="layui-card-header">鏃ュ嚭鍏ュ簱缁熻</div>
- <div class="layui-card-body">
- <div id="consoleChartsDay" style="height: 300px;"></div>
- </div>
- </div>
- </div>
-
- <div class="layui-col-md4 layui-col-sm6">
+<!-- <div class="layui-col-md4 layui-col-sm6">-->
+<!-- <div class="layui-card" style="overflow: hidden;">-->
+<!-- <div class="layui-card-header">鏃ュ嚭鍏ュ簱缁熻</div>-->
+<!-- <div class="layui-card-body">-->
+<!-- <div id="consoleChartsDay" style="height: 300px;"></div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- -->
+<!-- <div class="layui-col-md4 layui-col-sm6">-->
+<!-- <div class="layui-card" style="overflow: hidden;">-->
+<!-- <div class="layui-card-header">杩�7澶╁嚭鍏ュ簱缁熻</div>-->
+<!-- <div class="layui-card-body">-->
+<!-- <div id="consoleChartsWeek" style="height: 300px;"></div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-col-md8">
<div class="layui-card" style="overflow: hidden;">
<div class="layui-card-header">杩�7澶╁嚭鍏ュ簱缁熻</div>
<div class="layui-card-body">
@@ -185,26 +193,26 @@
var layer = layui.layer;
/** 娓叉煋鏃ョ粺璁″浘琛� */
- var myCharts1 = echarts.init(document.getElementById('consoleChartsDay'));
- var options1 = {
- title: {
- text: '鍏ュ簱杞︽/鍑哄簱杞︽', x: 'center', y: '32%',
- textStyle: {fontSize: 18, color: '#262626', fontWeight: 'normal'},
- subtextStyle: {fontSize: 56, color: '#10B4E8'}, itemGap: 20
- },
- color: ['#10B4E8', '#FFA800'],
- tooltip: {trigger: 'item'},
- legend: {
- orient: 'vertical', right: '0px', top: '0px',
- data: ['鍏ュ簱杞︽', '鍑哄簱杞︽'], textStyle: {color: '#595959'}
- },
- series: [{name: '鏁伴噺', type: 'pie', radius: ['75%', '80%'], label: {normal: {show: false}}}]
- };
- myCharts1.setOption(options1);
- // 璧嬪��
- myCharts1.setOption({
- title: {subtext: mainData.inNumDay + "/" + mainData.outNumDay}, series: [{data: [{name: '鍏ュ簱杞︽', value: mainData.inNumDay}, {name: '鍑哄簱杞︽', value: mainData.outNumDay}]}]
- });
+ // var myCharts1 = echarts.init(document.getElementById('consoleChartsDay'));
+ // var options1 = {
+ // title: {
+ // text: '鍏ュ簱杞︽/鍑哄簱杞︽', x: 'center', y: '32%',
+ // textStyle: {fontSize: 18, color: '#262626', fontWeight: 'normal'},
+ // subtextStyle: {fontSize: 56, color: '#10B4E8'}, itemGap: 20
+ // },
+ // color: ['#10B4E8', '#FFA800'],
+ // tooltip: {trigger: 'item'},
+ // legend: {
+ // orient: 'vertical', right: '0px', top: '0px',
+ // data: ['鍏ュ簱杞︽', '鍑哄簱杞︽'], textStyle: {color: '#595959'}
+ // },
+ // series: [{name: '鏁伴噺', type: 'pie', radius: ['75%', '80%'], label: {normal: {show: false}}}]
+ // };
+ // myCharts1.setOption(options1);
+ // // 璧嬪��
+ // myCharts1.setOption({
+ // title: {subtext: mainData.inNumDay + "/" + mainData.outNumDay}, series: [{data: [{name: '鍏ュ簱杞︽', value: mainData.inNumDay}, {name: '鍑哄簱杞︽', value: mainData.outNumDay}]}]
+ // });
/** 娓叉煋鍛ㄧ粺璁″浘琛� */
var myCharts2 = echarts.init(document.getElementById('consoleChartsWeek'));
@@ -423,7 +431,7 @@
/** 绐楀彛澶у皬鏀瑰彉浜嬩欢 */
window.onresize = function () {
- myCharts1.resize();
+ // myCharts1.resize();
myCharts2.resize();
myCharts3.resize();
myCharts4.resize();
--
Gitblit v1.9.3