From b8c401d88d6e2c982c466ff79d8cf3e3a5d4dcf5 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 31 十月 2023 17:02:20 +0800
Subject: [PATCH] 修改图层判断条件
---
src/main/java/com/moon/server/controller/show/ExportController.java | 4 ++--
src/main/java/com/moon/server/entity/show/ExportEntity.java | 24 ++++++++++++------------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/moon/server/controller/show/ExportController.java b/src/main/java/com/moon/server/controller/show/ExportController.java
index 5ce4fba..73d83f7 100644
--- a/src/main/java/com/moon/server/controller/show/ExportController.java
+++ b/src/main/java/com/moon/server/controller/show/ExportController.java
@@ -84,8 +84,8 @@
@PostMapping(value = "/insertMap", produces = "application/json; charset=UTF-8")
public ResponseMsg<String> insertMap(@RequestBody ExportEntity entity, HttpServletRequest req) {
try {
- boolean flag = entity.getXmin() == 0 && entity.getYmin() == 0 && entity.getXmax() == 0 && entity.getYmax() == 0;
- if (StringHelper.isEmpty(entity.getLayers()) || StringHelper.isEmpty(entity.getToken()) || flag) {
+ boolean flag = entity.getXmin() == null && entity.getYmin() == null && entity.getXmax() == null && entity.getYmax() == null;
+ if (StringHelper.isEmpty(entity.getToken()) || flag) {
return fail("鍙傛暟涓嶅畬鏁�");
}
diff --git a/src/main/java/com/moon/server/entity/show/ExportEntity.java b/src/main/java/com/moon/server/entity/show/ExportEntity.java
index ecf493d..687bc4b 100644
--- a/src/main/java/com/moon/server/entity/show/ExportEntity.java
+++ b/src/main/java/com/moon/server/entity/show/ExportEntity.java
@@ -33,13 +33,13 @@
private double rotation;
- private double xmin;
+ private Double xmin;
- private double ymin;
+ private Double ymin;
- private double ymax;
+ private Double ymax;
- private double xmax;
+ private Double xmax;
private List<Integer> layerIds;
@@ -119,35 +119,35 @@
this.rotation = rotation;
}
- public double getXmin() {
+ public Double getXmin() {
return xmin;
}
- public void setXmin(double xmin) {
+ public void setXmin(Double xmin) {
this.xmin = xmin;
}
- public double getYmin() {
+ public Double getYmin() {
return ymin;
}
- public void setYmin(double ymin) {
+ public void setYmin(Double ymin) {
this.ymin = ymin;
}
- public double getYmax() {
+ public Double getYmax() {
return ymax;
}
- public void setYmax(double ymax) {
+ public void setYmax(Double ymax) {
this.ymax = ymax;
}
- public double getXmax() {
+ public Double getXmax() {
return xmax;
}
- public void setXmax(double xmax) {
+ public void setXmax(Double xmax) {
this.xmax = xmax;
}
--
Gitblit v1.9.3