From 34159df2cce79612bef8681bcfcfda238b52bcd4 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 11 Jul 2022 11:17:14 +0800
Subject: [PATCH] 大屏接口对接
---
src/main/java/org/springblade/modules/lang/controller/LandController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/lang/controller/LandController.java b/src/main/java/org/springblade/modules/lang/controller/LandController.java
index ccdd422..88d098c 100644
--- a/src/main/java/org/springblade/modules/lang/controller/LandController.java
+++ b/src/main/java/org/springblade/modules/lang/controller/LandController.java
@@ -32,6 +32,7 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.farm.entity.Farm;
import org.springblade.modules.farm.vo.FarmVO;
+import org.springblade.modules.resource.endpoint.OssEndpoint;
import org.springblade.modules.system.entity.DictBiz;
import org.springblade.modules.system.service.IDictBizService;
import org.springframework.web.bind.annotation.*;
@@ -63,6 +64,7 @@
private final ILandService landService;
private final IDictBizService dictService;
+ private final OssEndpoint ossEndpoint;
/**
* 详情
@@ -145,6 +147,18 @@
} else {
v1 = (double) Math.round(area * 100) / 100;
}
+
+ //图片转换上传
+ if (null!=land.getUrl() && !land.getUrl().equals("")){
+ try {
+ //上传
+ String url = ossEndpoint.uploadBase64String(land.getUrl());
+ //回填url
+ land.setUrl(url);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
land.setLandArea(String.valueOf(v1));
land.setType(1);
return R.status(landService.saveLandInfo(land));
@@ -189,6 +203,18 @@
} else {
v1 = (double) Math.round(area * 100) / 100;
}
+
+ //图片转换上传
+ if (null!=land.getUrl() && !land.getUrl().equals("")){
+ try {
+ //上传
+ String url = ossEndpoint.uploadBase64String(land.getUrl());
+ //回填url
+ land.setUrl(url);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
land.setLandArea(String.valueOf(v1));
land.setType(1);
return R.status(landService.updateLandById(land));
@@ -225,13 +251,24 @@
/**
+ * 地块列表(不分页)
+ * @param land
+ * @return
+ */
+ @GetMapping("/getLandList")
+ public R getLandList(LandVO land) {
+ return R.data(landService.getLandList(land));
+ }
+
+
+ /**
* 首页地块统计接口
*/
@GetMapping("/selectCount")
- public R selectCount() {
- List<Map<String, Object>> list = landService.selectZAre();
- List<Map<String, Object>> lists = landService.selectSAre();
- List list1 = landService.selectNum();
+ public R selectCount(String deptId) {
+ List<Map<String, Object>> list = landService.selectZAre(deptId);
+ List<Map<String, Object>> lists = landService.selectSAre(deptId);
+ List list1 = landService.selectNum(deptId);
//总面积
Double num = 0.0;
for (int i = 0; i < list.size(); i++) {
@@ -300,11 +337,11 @@
* 大屏地块统计接口
*/
@GetMapping("/selectXCount")
- public R selectXCount() {
- List<Map<String, Object>> list = landService.selectZAre();
- List<Map<String, Object>> lists = landService.selectSAre();
- List<Map<String, Object>> listw = landService.selectWAre();
- List list1 = landService.selectNum();
+ public R selectXCount(String deptId) {
+ List<Map<String, Object>> list = landService.selectZAre(deptId);
+ List<Map<String, Object>> lists = landService.selectSAre(deptId);
+ List<Map<String, Object>> listw = landService.selectWAre(deptId);
+ List list1 = landService.selectNum(deptId);
//总面积
Double num = 0.0;
for (int i = 0; i < list.size(); i++) {
--
Gitblit v1.9.3