From 514705c874699fb016ca405961e50dcb15af2648 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 28 十一月 2023 10:28:16 +0800
Subject: [PATCH] 栅格分析返回值添加图层单位字段

---
 src/main/java/com/moon/server/service/data/RasterAnalysisService.java |    2 ++
 src/main/java/com/moon/server/entity/data/AnalysisResultEntity.java   |   10 ++++++++++
 src/main/java/com/moon/server/entity/data/PublishEntity.java          |   10 ++++++++++
 src/main/resources/application.yml                                    |    8 ++++----
 src/main/resources/mapper/data/PublishMapper.xml                      |    2 +-
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/moon/server/entity/data/AnalysisResultEntity.java b/src/main/java/com/moon/server/entity/data/AnalysisResultEntity.java
index 78d33fd..8f64e3b 100644
--- a/src/main/java/com/moon/server/entity/data/AnalysisResultEntity.java
+++ b/src/main/java/com/moon/server/entity/data/AnalysisResultEntity.java
@@ -58,6 +58,8 @@
 
     private String info;
 
+    private String unit;
+
     private List<Point> points;
 
     public String getToken() {
@@ -116,6 +118,14 @@
         this.info = info;
     }
 
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
     public List<Point> getPoints() {
         return points;
     }
diff --git a/src/main/java/com/moon/server/entity/data/PublishEntity.java b/src/main/java/com/moon/server/entity/data/PublishEntity.java
index 4716507..74cbc73 100644
--- a/src/main/java/com/moon/server/entity/data/PublishEntity.java
+++ b/src/main/java/com/moon/server/entity/data/PublishEntity.java
@@ -68,6 +68,8 @@
 
     private String proxy;
 
+    private String unit;
+
     public PublishEntity() {
     }
 
@@ -302,4 +304,12 @@
     public void setProxy(String proxy) {
         this.proxy = proxy;
     }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
 }
diff --git a/src/main/java/com/moon/server/service/data/RasterAnalysisService.java b/src/main/java/com/moon/server/service/data/RasterAnalysisService.java
index 2df3695..6172f70 100644
--- a/src/main/java/com/moon/server/service/data/RasterAnalysisService.java
+++ b/src/main/java/com/moon/server/service/data/RasterAnalysisService.java
@@ -79,6 +79,7 @@
             try {
                 AnalysisResultEntity entity = new AnalysisResultEntity(token);
                 entity.setLayerName(pub.getName());
+                entity.setUnit(pub.getUnit());
 
                 List<MetaEntity> metas = publishService.selectMetasByPubid(pub.getId());
                 if (null == metas || metas.isEmpty()) {
@@ -156,6 +157,7 @@
             try {
                 AnalysisResultEntity entity = new AnalysisResultEntity();
                 entity.setLayerName(pub.getName());
+                entity.setUnit(pub.getUnit());
 
                 List<MetaEntity> metas = publishService.selectMetasByPubid(pub.getId());
                 if (null == metas || metas.isEmpty()) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 84f63f7..b2e4cc5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -46,12 +46,12 @@
   datasource:
     name: prod
     # JDBC 鍩烘湰閰嶇疆 &currentSchema=public
-    url: jdbc:postgresql://127.0.0.1:5433/moon?useAffectedRows=true
-    #url: jdbc:postgresql://192.168.20.83:5433/moon?useAffectedRows=true
+    #url: jdbc:postgresql://127.0.0.1:5433/moon?useAffectedRows=true
+    url: jdbc:postgresql://192.168.20.83:5433/moon?useAffectedRows=true
     #url: jdbc:postgresql://103.85.165.99:25432/moon?useAffectedRows=true
     username: postgres
-    #password: Postgres!_14_moon
-    password: postgres
+    #password: postgres
+    password: Postgres!_14_moon
     driver-class-name: org.postgresql.Driver
     platform: POSTGRESQL
     type: com.alibaba.druid.pool.DruidDataSource
diff --git a/src/main/resources/mapper/data/PublishMapper.xml b/src/main/resources/mapper/data/PublishMapper.xml
index 1dab65b..7eb3e17 100644
--- a/src/main/resources/mapper/data/PublishMapper.xml
+++ b/src/main/resources/mapper/data/PublishMapper.xml
@@ -103,7 +103,7 @@
     </select>
 
     <select id="selectRaster" resultType="com.moon.server.entity.data.PublishEntity">
-        select c.cn_name "name", a.*
+        select c.cn_name "name", c.unit, a.*
         from lf.sys_publish a inner join lf.sys_res b on a.id = b.pubid
         inner join lf.sys_layer c on b.id = c.resid
         where a.type in ('DOM', 'DEM') and a.status = 3 and c.status = 1;

--
Gitblit v1.9.3