From 171f021009d50ba63d1f74fc7fd8eeabc9ddbb94 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 28 五月 2024 08:27:00 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoCropOne.java | 2 +-
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnitOne.java | 2 +-
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoScheduling.java | 4 ++--
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnit.java | 2 +-
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoCrop.java | 5 ++++-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrCropMapper.xml | 3 ++-
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java | 23 +++++++++++++++--------
7 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoCrop.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoCrop.java
index 14f8e45..1772e71 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoCrop.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoCrop.java
@@ -15,8 +15,11 @@
@Schema(name = "浣滅墿瑙嗗浘")
public class VoCrop implements BaseEntity {
@Schema(description = "瀹炰綋id")
- private Long id;
+ private String id;
@Schema(description = "浣滅墿鍚嶇О")
private String cropName;
+
+ @Schema(description = "澶囨敞")
+ private String remarks;
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoCropOne.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoCropOne.java
index e56e48d..e769843 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoCropOne.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoCropOne.java
@@ -15,7 +15,7 @@
public class VoCropOne implements BaseEntity {
@Schema(description = "瀹炰綋id")
- private Long id;
+ private String id;
@Schema(description = "浣滅墿鍚嶇О")
private String cropName;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoScheduling.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoScheduling.java
index ee86118..ee1fa74 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoScheduling.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoScheduling.java
@@ -23,10 +23,10 @@
@Schema(description = "浣滅墿鐢熼暱鏈�")
private String growthPeriod;
- @Schema(description = "浣滅墿鐢熼暱鏈�")
+ @Schema(description = "鐏屾按鍛ㄦ湡")
private int irrigateCycle;
- @Schema(description = "浣滅墿鐢熼暱鏈�")
+ @Schema(description = "鐏屾按寤剁画鏃堕棿")
private int duration;
@Schema(description = "澶囨敞")
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnit.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnit.java
index dad0e72..b09d4f5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnit.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnit.java
@@ -27,7 +27,7 @@
private String unitId;
@Schema(description = "鐏屾簤闈㈢Н")
- private Integer area;
+ private Double area;
@Schema(description = "澶囨敞")
private String remarks;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnitOne.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnitOne.java
index 3ff7458..426727f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnitOne.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnitOne.java
@@ -25,7 +25,7 @@
private String id;
@Schema(description = "鐏屾簤闈㈢Н")
- private Integer area;
+ private Double area;
@Schema(description = "澶囨敞")
private String remarks;
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrCropMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrCropMapper.xml
index fb1c0b8..da5e8f4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrCropMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrCropMapper.xml
@@ -84,7 +84,8 @@
<select id="getCrops" resultType="com.dy.pipIrrGlobal.voIr.VoCrop">
SELECT
CAST(cro.id AS char)AS id,
- cro.crop_name AS cropName
+ cro.crop_name AS cropName,
+ cro.remarks
FROM ir_crop cro
<where>
cro.deleted = 0
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java
index cb35271..7694fbb 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java
@@ -31,10 +31,7 @@
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
/**
* @author :WuZeYu
@@ -322,10 +319,15 @@
@GetMapping(path = "bind_units")
@SsoAop()
- public BaseResponse<List<Long>> getGroupBindUnits(Long id) {
+ public BaseResponse<List<String>> getGroupBindUnits(Long id) {
try {
List<Long> res = irrigateGroupSv.getGroupBindUnits(id);
- return BaseResponseUtils.buildSuccess(res);
+ ArrayList<Object> list = new ArrayList<>();
+ for (int i = 0; i < res.size(); i++) {
+ String aLong = res.get(i).toString();
+ list.add(aLong);
+ }
+ return BaseResponseUtils.buildSuccess(list);
} catch (Exception e) {
log.error("鑾峰彇涓�涓疆鐏岀粍缁戝畾鐏屾簤鍗曞厓璁板綍寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
@@ -334,10 +336,15 @@
@GetMapping(path = "notBind_units")
@SsoAop()
- public BaseResponse<List<Long>> getNotBindUnits() {
+ public BaseResponse<List<String>> getNotBindUnits() {
try {
List<Long> res = irrigateGroupSv.getNotBindUnits();
- return BaseResponseUtils.buildSuccess(res);
+ ArrayList<Object> list = new ArrayList<>();
+ for (int i = 0; i < res.size(); i++) {
+ String aLong = res.get(i).toString();
+ list.add(aLong);
+ }
+ return BaseResponseUtils.buildSuccess(list);
} catch (Exception e) {
log.error("鑾峰彇鏈粦瀹氳疆鐏岀粍鐨勭亴婧夊崟鍏僫d璁板綍寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
--
Gitblit v1.8.0