From e898cd9ca017a6f5bfe4266fcd2830b232047bc8 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 02 九月 2023 10:23:26 +0800
Subject: [PATCH] 修改颜色表属性设置
---
src/main/java/com/moon/server/service/data/PublishService.java | 25 --------
src/main/java/com/moon/server/entity/shujian/GradientColorTableEntity.java | 48 ++++++++--------
src/main/java/com/moon/server/entity/shujian/CreateLayerEntity.java | 22 +++++-
src/main/java/com/moon/server/entity/shujian/ColorTableEntity.java | 50 ++++++++++++++++
src/main/java/com/moon/server/controller/data/PublishController.java | 3 -
5 files changed, 91 insertions(+), 57 deletions(-)
diff --git a/src/main/java/com/moon/server/controller/data/PublishController.java b/src/main/java/com/moon/server/controller/data/PublishController.java
index fb690a1..e0d15fe 100644
--- a/src/main/java/com/moon/server/controller/data/PublishController.java
+++ b/src/main/java/com/moon/server/controller/data/PublishController.java
@@ -303,10 +303,7 @@
return fail("娌℃湁鎵惧埌瑕佸垹闄ょ殑鏁版嵁", -1);
}
- // publishService.deleteFiles(list)
permsService.clearPermsCache();
- publishService.deleteFiles(ids, req);
-
int count = publishService.deletes(ids, req);
return success(count);
diff --git a/src/main/java/com/moon/server/entity/shujian/ColorTableEntity.java b/src/main/java/com/moon/server/entity/shujian/ColorTableEntity.java
index 383c7a0..70c3d6f 100644
--- a/src/main/java/com/moon/server/entity/shujian/ColorTableEntity.java
+++ b/src/main/java/com/moon/server/entity/shujian/ColorTableEntity.java
@@ -12,6 +12,56 @@
public class ColorTableEntity implements Serializable {
private static final long serialVersionUID = -7178280280689493423L;
+ private short r;
+
+ private short g;
+
+ private short b;
+
+ private double low;
+
+ private double high;
+
public ColorTableEntity() {
}
+
+ public short getR() {
+ return r;
+ }
+
+ public void setR(short r) {
+ this.r = r;
+ }
+
+ public short getG() {
+ return g;
+ }
+
+ public void setG(short g) {
+ this.g = g;
+ }
+
+ public short getB() {
+ return b;
+ }
+
+ public void setB(short b) {
+ this.b = b;
+ }
+
+ public double getLow() {
+ return low;
+ }
+
+ public void setLow(double low) {
+ this.low = low;
+ }
+
+ public double getHigh() {
+ return high;
+ }
+
+ public void setHigh(double high) {
+ this.high = high;
+ }
}
diff --git a/src/main/java/com/moon/server/entity/shujian/CreateLayerEntity.java b/src/main/java/com/moon/server/entity/shujian/CreateLayerEntity.java
index dbf398f..057d912 100644
--- a/src/main/java/com/moon/server/entity/shujian/CreateLayerEntity.java
+++ b/src/main/java/com/moon/server/entity/shujian/CreateLayerEntity.java
@@ -518,18 +518,30 @@
private Map<String, Object> config;
+ public Process() {
+ uuid = StringHelper.getGuid();
+ name = "color_table";
+
+ config = new HashMap<>();
+ config.put("default", new Default());
+ }
+
/**
* 澶勭悊杩囩▼
*
* @param type 0-榛樿鑹叉澘锛�1-娓愬彉鑹叉澘
* @param levels 灞傜骇
*/
- public Process(Integer type, List<GradientColorTableEntity> levels) {
- uuid = StringHelper.getGuid();
- name = "color_table";
+ public Process(Integer type, List<?> levels) {
+ this();
+ config.put("type", type);
+ config.put("levels", levels);
+ }
- config = new HashMap<>();
- config.put("default", new Default());
+ /**
+ * 璁剧疆棰滆壊琛�
+ */
+ public void SetColorTable(Integer type, List<?> levels) {
config.put("type", type);
config.put("levels", levels);
}
diff --git a/src/main/java/com/moon/server/entity/shujian/GradientColorTableEntity.java b/src/main/java/com/moon/server/entity/shujian/GradientColorTableEntity.java
index bb25ded..abdcdfa 100644
--- a/src/main/java/com/moon/server/entity/shujian/GradientColorTableEntity.java
+++ b/src/main/java/com/moon/server/entity/shujian/GradientColorTableEntity.java
@@ -12,86 +12,86 @@
public class GradientColorTableEntity implements Serializable {
private static final long serialVersionUID = 3436664443231697504L;
- private Double r_start;
+ private short r_start;
- private Double g_start;
+ private short g_start;
- private Double b_start;
+ private short b_start;
- private Double r_end;
+ private short r_end;
- private Double g_end;
+ private short g_end;
- private Double b_end;
+ private short b_end;
- private Double low;
+ private double low;
- private Double high;
+ private double high;
public GradientColorTableEntity() {
}
- public Double getR_start() {
+ public short getR_start() {
return r_start;
}
- public void setR_start(Double r_start) {
+ public void setR_start(short r_start) {
this.r_start = r_start;
}
- public Double getG_start() {
+ public short getG_start() {
return g_start;
}
- public void setG_start(Double g_start) {
+ public void setG_start(short g_start) {
this.g_start = g_start;
}
- public Double getB_start() {
+ public short getB_start() {
return b_start;
}
- public void setB_start(Double b_start) {
+ public void setB_start(short b_start) {
this.b_start = b_start;
}
- public Double getR_end() {
+ public short getR_end() {
return r_end;
}
- public void setR_end(Double r_end) {
+ public void setR_end(short r_end) {
this.r_end = r_end;
}
- public Double getG_end() {
+ public short getG_end() {
return g_end;
}
- public void setG_end(Double g_end) {
+ public void setG_end(short g_end) {
this.g_end = g_end;
}
- public Double getB_end() {
+ public short getB_end() {
return b_end;
}
- public void setB_end(Double b_end) {
+ public void setB_end(short b_end) {
this.b_end = b_end;
}
- public Double getLow() {
+ public double getLow() {
return low;
}
- public void setLow(Double low) {
+ public void setLow(double low) {
this.low = low;
}
- public Double getHigh() {
+ public double getHigh() {
return high;
}
- public void setHigh(Double high) {
+ public void setHigh(double high) {
this.high = high;
}
}
diff --git a/src/main/java/com/moon/server/service/data/PublishService.java b/src/main/java/com/moon/server/service/data/PublishService.java
index 818636b..7b6bed4 100644
--- a/src/main/java/com/moon/server/service/data/PublishService.java
+++ b/src/main/java/com/moon/server/service/data/PublishService.java
@@ -4,10 +4,8 @@
import com.moon.server.entity.all.ResponseMsg;
import com.moon.server.entity.all.StaticData;
import com.moon.server.entity.ctrl.PubEntity;
-import com.moon.server.entity.ctrl.RegisterEntity;
import com.moon.server.entity.data.MetaEntity;
import com.moon.server.entity.data.PublishEntity;
-import com.moon.server.entity.sys.UserEntity;
import com.moon.server.helper.PathHelper;
import com.moon.server.helper.RestHelper;
import com.moon.server.helper.StringHelper;
@@ -43,13 +41,7 @@
PublishMapper publishMapper;
@Resource
- FmeService fmeService;
-
- @Resource
PathHelper pathHelper;
-
- @Resource
- TokenService tokenService;
private final static Log log = LogFactory.getLog(PublishService.class);
@@ -255,23 +247,6 @@
String cmd = String.format("cmd /c rd \"%s\" /s /q", path);
WebHelper.exec(cmd);
}
- }
-
- /**
- * 鍒犻櫎鍙戝竷鏂囦欢
- */
- public void deleteFiles(List<Integer> ids, HttpServletRequest req) {
- PubEntity entity = new PubEntity();
- entity.setIds(ids);
- entity.setDircode("00");
-
- UserEntity ue = tokenService.getCurrentUser(req);
- if (ue != null) {
- entity.setUserId(ue.getId());
- entity.setToken(WebHelper.getToken(req));
- }
-
- long rows = postForPub(entity, "/Convert/DeleteFiles");
}
/**
--
Gitblit v1.9.3