添加图例

onemap-api/onemap-api-system/src/main/java/com/onemap/system/api/domain/WktsVo.java

@@ -1,7 +1,6 @@
 package com.onemap.system.api.domain;
 
 
-
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
@@ -19,8 +18,30 @@ public class WktsVo {
         private String wkt;
         private String borderColor = "#ff0000";
         private float borderOpacity = 1;
+        //图例名称
+        private String legendText = "";
+        //图例是否显示
+        private boolean legendDisplay = false;
+        private String legendColor = "";
+        private Float legendColorOpacity;
 
         private String fillColor = "#ffffff";
         private float fillOpacity = 0.3F;
+
+        public String getLegendText() {
+            return legendText;
+        }
+
+        public void setLegendText(String legendText) {
+            this.legendText = legendText;
+        }
+
+        public boolean getLegendDisplay() {
+            return legendDisplay;
+        }
+
+        public void setLegendDisplay(boolean legendDisplay) {
+            this.legendDisplay = legendDisplay;
+        }
     }
 }

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/impl/QytdzzReportServiceImpl.java

@@ -39,7 +39,7 @@ public class QytdzzReportServiceImpl implements QytdzzReportService {
         iLogService.saveLog(bsm, "整治预判分析", "整治预判分析中生成报告开始。。。", "info");
 
         // 文件硬盘真实路径
-        String timeStamp = DateUtils.dateTimeNow() ;
+        String timeStamp = DateUtils.dateTimeNow();
         String tempPath = temp;
         String rootPath = File.separator + "整治预判分析报告" + File.separator + bsm;
         String docxName = "整治预判分析报告_" + timeStamp + ".docx";
@@ -170,25 +170,25 @@ public class QytdzzReportServiceImpl implements QytdzzReportService {
 
         NpoiHelper.TableTitle tableTitle = new NpoiHelper.TableTitle();
         tableTitle.setKey("key");
-        tableTitle.setName("道路名称");
+        tableTitle.setName("类型名称");
         tableTitle.setWidth(1880);
         tabYzTitles.add(tableTitle);
 
         tableTitle = new NpoiHelper.TableTitle();
         tableTitle.setKey("zzq_area");
-        tableTitle.setName("面积");
+        tableTitle.setName("整治前面积（㎡）");
         tableTitle.setWidth(1880);
         tabYzTitles.add(tableTitle);
 
         tableTitle = new NpoiHelper.TableTitle();
         tableTitle.setKey("zzh_area");
-        tableTitle.setName("面积");
+        tableTitle.setName("整治后面积（㎡）");
         tableTitle.setWidth(1880);
         tabYzTitles.add(tableTitle);
 
         tableTitle = new NpoiHelper.TableTitle();
         tableTitle.setKey("ce_area");
-        tableTitle.setName("面积");
+        tableTitle.setName("差额面积（㎡）");
         tableTitle.setWidth(1880);
         tabYzTitles.add(tableTitle);
         NpoiHelper.setComTable(document, tabYzTitles, dataTablelist, title, pos);
@@ -201,12 +201,15 @@ public class QytdzzReportServiceImpl implements QytdzzReportService {
         if (dataTablelist != null && dataTablelist.size() > 0) {
             for (Map map_0 : dataTablelist) {
                 String zzh_geom = (String) map_0.get("zzh_geom");
+                String key = (String) map_0.get("key");
                 if (StringUtils.isNotEmpty(zzh_geom)) {
                     WktsVo.WktInfo wktInfo = new WktsVo.WktInfo();
                     String colorString = generateRandomColor();
                     wktInfo.setWkt(zzh_geom);
                     wktInfo.setFillColor(colorString);
                     wktInfo.setBorderColor(colorString);
+                    wktInfo.setLegendText("整治后" + key);
+                    wktInfo.setLegendDisplay(true);
                     sandiaoWtsList.add(wktInfo);
                 }
 
@@ -217,6 +220,8 @@ public class QytdzzReportServiceImpl implements QytdzzReportService {
                     wktInfo.setWkt(zzq_geom);
                     wktInfo.setFillColor(colorString);
                     wktInfo.setBorderColor(colorString);
+                    wktInfo.setLegendText("整治前" + key);
+                    wktInfo.setLegendDisplay(true);
                     sandiaoWtsList.add(wktInfo);
                 }
             }
@@ -263,10 +268,13 @@ public class QytdzzReportServiceImpl implements QytdzzReportService {
             for (Map map_0 : dataTablelist) {
                 WktsVo.WktInfo wktInfo = new WktsVo.WktInfo();
                 String geom = (String) map_0.get("geomvalue");
+                String groupvalue = (String) map_0.get("groupvalue");
                 if (StringUtils.isNotEmpty(geom)) {
                     wktInfo.setWkt(geom);
                     String colorString = generateRandomColor();
                     wktInfo.setFillColor(colorString);
+                    wktInfo.setLegendText(groupvalue);
+                    wktInfo.setLegendDisplay(true);
                     wktInfo.setBorderColor(colorString);
                     sandiaoWtsList.add(wktInfo);
                 }
@@ -314,10 +322,13 @@ public class QytdzzReportServiceImpl implements QytdzzReportService {
             for (Map map_0 : dataTablelist) {
                 WktsVo.WktInfo wktInfo = new WktsVo.WktInfo();
                 String geom = (String) map_0.get("geomvalue");
+                String yzBsm = (String) map_0.get("yzBsm");
                 if (StringUtils.isNotEmpty(geom)) {
                     wktInfo.setWkt(geom);
                     String colorString = generateRandomColor();
                     wktInfo.setFillColor(colorString);
+                    wktInfo.setLegendText(yzBsm);
+                    wktInfo.setLegendDisplay(true);
                     wktInfo.setBorderColor(colorString);
                     sandiaoWtsList.add(wktInfo);
                 }