From b6f287e6116bc24647436b48e852e9017fcbce60 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 12 九月 2023 15:44:05 +0800
Subject: [PATCH] 修改入库状态~
---
src/main/java/com/moon/server/entity/all/StaticData.java | 2 ++
src/main/java/com/moon/server/aspect/LogAspect.java | 5 ++---
src/main/java/com/moon/server/service/data/ShuJianService.java | 15 ++++++++-------
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/moon/server/aspect/LogAspect.java b/src/main/java/com/moon/server/aspect/LogAspect.java
index 8a6027b..ac014cb 100644
--- a/src/main/java/com/moon/server/aspect/LogAspect.java
+++ b/src/main/java/com/moon/server/aspect/LogAspect.java
@@ -1,6 +1,7 @@
package com.moon.server.aspect;
import com.moon.server.annotation.SysLog;
+import com.moon.server.entity.all.StaticData;
import com.moon.server.entity.sys.OperateEntity;
import com.moon.server.entity.sys.UserEntity;
import com.moon.server.helper.AsyncHelper;
@@ -49,8 +50,6 @@
private final static String COUNT = "count";
- private final static String SPLIT = "\\\\";
-
private static final Log log = LogFactory.getLog(LogAspect.class);
@Pointcut("@annotation(com.moon.server.annotation.SysLog)")
@@ -97,7 +96,7 @@
// 璁剧疆妯″潡
Api api = clazz.getAnnotation(Api.class);
if (api != null) {
- String[] strs = api.tags()[0].split(SPLIT);
+ String[] strs = api.tags()[0].split(StaticData.BACKSLASH);
oe.setModular1(strs[0]);
oe.setModular2(strs[1]);
}
diff --git a/src/main/java/com/moon/server/entity/all/StaticData.java b/src/main/java/com/moon/server/entity/all/StaticData.java
index 8b6e619..99b97d3 100644
--- a/src/main/java/com/moon/server/entity/all/StaticData.java
+++ b/src/main/java/com/moon/server/entity/all/StaticData.java
@@ -96,6 +96,8 @@
public final static String TILDE = "~";
+ public final static String BACKSLASH = "\\\\";
+
public final static String SINGLE_QUOTES = "'";
public final static String BBOREHOLE = "bborehole";
diff --git a/src/main/java/com/moon/server/service/data/ShuJianService.java b/src/main/java/com/moon/server/service/data/ShuJianService.java
index d4021c5..81ab86c 100644
--- a/src/main/java/com/moon/server/service/data/ShuJianService.java
+++ b/src/main/java/com/moon/server/service/data/ShuJianService.java
@@ -129,7 +129,7 @@
resService.insert(resEntity);
insertMetaPub(pub, publishEntity.getId());
- layerService.insert(createLayerEntity(resEntity, StaticData.I3));
+ // layerService.insert(createLayerEntity(resEntity, StaticData.I3))
return rows;
}
@@ -153,13 +153,14 @@
layer.setNodata(getNoData(pub, metas));
layer.setConfig(getColorTableConfig(entity, pub));
- CreateLayerEntity.ImagePathList imagePathList = entity.new ImagePathList();
- imagePathList.setPath(sjPath);
- entity.getImage_path_list().add(imagePathList);
-
- List<String> filters = imagePathList.getFilter();
for (MetaEntity meta : metas) {
- filters.add(meta.getPath().replace("\\", "/"));
+ String[] strs = meta.getPath().split(StaticData.BACKSLASH);
+
+ CreateLayerEntity.ImagePathList imagePathList = entity.new ImagePathList();
+ imagePathList.setPath(sjPath + strs[0]);
+ imagePathList.getFilter().add(strs[1]);
+
+ entity.getImage_path_list().add(imagePathList);
}
return entity;
--
Gitblit v1.9.3