From 8bdbba337b312e8d5b5769f945236b9b5472ebc2 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 11 Jun 2022 09:05:33 +0800
Subject: [PATCH] 农资统计
---
src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java | 92 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 81 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java b/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
index da64666..f8eb416 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
@@ -42,12 +42,15 @@
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* 农场养殖记录表控制器
- * @since 2022-05-12
+ *
* @author zhongrj
+ * @since 2022-05-12
*/
@RestController
@AllArgsConstructor
@@ -104,23 +107,23 @@
public R save(@Valid @RequestBody FarmPlant farmPlant) {
farmPlant.setCreateTime(new Date());
boolean save = farmplantService.save(farmPlant);
- if (save){
+ if (save) {
//同时生成农事记录
FarmingRecord record = new FarmingRecord();
record.setCreateTime(new Date());
record.setJobWay(farmPlant.getJobWay());
record.setTime(farmPlant.getTransplanTime());
- if(farmPlant.getPlantingWay().equals("0")){
+ if (farmPlant.getPlantingWay().equals("0")) {
//移栽
record.setType("10");
}
- if(farmPlant.getPlantingWay().equals("1")){
+ if (farmPlant.getPlantingWay().equals("1")) {
//直播
record.setType("11");
}
record.setLandId(farmPlant.getLandId());
record.setOperator(farmPlant.getCreateUser());
- record.setRemarks("品种: "+farmPlant.getVarieties());
+ record.setRemarks("品种: " + farmPlant.getVarieties());
//新增
farmingRecordService.save(record);
@@ -143,7 +146,7 @@
public R update(@Valid @RequestBody FarmPlant farmPlant) {
boolean status = false;
//如果是结束
- if (farmPlant.getStatus().equals("2")){
+ if (farmPlant.getStatus().equals("2")) {
//更新
status = farmplantService.updateById(farmPlant);
//判断该地块是否还有种植的农产品
@@ -152,14 +155,14 @@
farmPlant1.setLandId(farmPlant2.getLandId());
farmPlant1.setStatus("1");
List<FarmPlant> list = farmplantService.list(new QueryWrapper<>(farmPlant1));
- if (list.size()<1){
+ if (list.size() < 1) {
//更新该地块的耕种状态
Land land = new Land();
land.setType(1);
land.setId(Long.parseLong(farmPlant2.getLandId()));
landService.updateById(land);
}
- }else {
+ } else {
//更新
status = farmplantService.updateById(farmPlant);
}
@@ -191,17 +194,19 @@
/**
* 农产品种养统计
+ *
* @param farmPlantVO 农产品种植对象
- * @param query 分页查询对象
+ * @param query 分页查询对象
* @return
*/
@GetMapping("/getFarmPlantStatistics")
public R<IPage<FarmPlantVO>> getFarmPlantStatistics(FarmPlantVO farmPlantVO, Query query) {
- return R.data(farmplantService.getFarmPlantStatistics(Condition.getPage(query),farmPlantVO));
+ return R.data(farmplantService.getFarmPlantStatistics(Condition.getPage(query), farmPlantVO));
}
/**
* 农产品种养统计(累计和)
+ *
* @param farmPlantVO 农产品种植对象
* @return
*/
@@ -212,12 +217,77 @@
/**
* 农产品列表
+ *
* @param farm 农产品对象
* @return
*/
@GetMapping("/strain-tree")
- public R strainTree(FarmPlantVO farm){
+ public R strainTree(FarmPlantVO farm) {
return R.data(farmplantService.strainTree(farm));
}
+
+ /**
+ * 大屏种养品种接口
+ *
+ * @param farmPlant
+ * @param query
+ * @return
+ */
+ @GetMapping("/pagePalnt")
+ public R pagePalnt(FarmPlantVO farmPlant, Query query) {
+ int i = farmplantService.selectCount();
+ IPage<FarmPlantVO> pages = farmplantService.selectFarmPlantPage(Condition.getPage(query), farmPlant);
+ Map map = new HashMap<>();
+ map.put("num", i);
+ map.put("page", pages);
+ return R.data(map);
+ }
+
+ /**
+ * 种植品种监管 0：有机 1：绿色 2：无公害 3：普通
+ * code=1(当天) =2(月) =3(年)
+ *
+ * @return
+ */
+ @GetMapping("/selectPlant")
+ public R selectPlant(String code, String time) {
+ Map map1 = farmplantService.selectPlant(code, time);
+ Map map2 = farmplantService.selectPlantl(code, time);
+ Map map3 = farmplantService.selectPlantw(code, time);
+ Map map4 = farmplantService.selectPlantp(code, time);
+ Map map = new HashMap();
+ map.put("yj", map1.get("num"));
+ map.put("ls", map2.get("num"));
+ map.put("wgh", map3.get("num"));
+ map.put("pt", map4.get("num"));
+ return R.data(map);
+ }
+
+ /**
+ * 种植采收监管 产品等级（0：一等品 1：二等品 2：三等品 3：四等品4：五等品 code=1(当天) =2(月) =3(年)
+ *
+ * @return
+ */
+ @GetMapping("/selectProduct")
+ public R selectProduct(String code, String time) {
+ //（0：一等品
+ Map map1 = farmplantService.selectProduct(code, time);
+ //1：二等品
+ Map map2 = farmplantService.selectProducty(code, time);
+ //2：三等品
+ Map map3 = farmplantService.selectProductr(code, time);
+ //3：四等品
+ Map map4 = farmplantService.selectProducts(code, time);
+ //4：五等品
+ Map map5 = farmplantService.selectProductf(code, time);
+ Map map = new HashMap();
+ map.put("yi", map1.get("num"));
+ map.put("er", map2.get("num"));
+ map.put("san", map3.get("num"));
+ map.put("shi", map4.get("num"));
+ map.put("wu", map5.get("num"));
+ return R.data(map);
+ }
+
}
--
Gitblit v1.9.3