Merge branch 'dev' of http://114.244.114.158:8802/siwei/sanya-data-management-back into dev

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

@@ -294,6 +294,7 @@ public class HgxfxJgReportServiceImpl implements HgxfxJgReportService {
         tabYzTitles.add(tableTitle);
         // 查询选址因子，并且转换为List<Map> 因子条件（包含:C、不包含:N、分析:A）
         List<Map<String, Object>> dataTablelist = getScxList(jdList, null, 0);
+        System.out.println(dataTablelist);
         XWPFTable tableYz = NpoiHelper.setComTable(document, tabYzTitles, dataTablelist, "合规性分析因子", pos);
     }
 

onemap-modules/onemap-spatial/src/main/java/com/onemap/spatial/service/impl/ImageServiceImpl.java

@@ -120,7 +120,7 @@ public class ImageServiceImpl implements IImageService {
         // 将地图绘制到图片
         File outputFile = new File(filePath);
         try (FileOutputStream fileOutputStream = new FileOutputStream(outputFile); ImageOutputStream outputImageFile = ImageIO.createImageOutputStream(fileOutputStream);) {
-            int w = 1000;
+            int w = 800;
             int h = (int) (w * (combinedBounds.getHeight() / combinedBounds.getWidth()));
             BufferedImage bufferedImage = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
             Graphics2D g2d = bufferedImage.createGraphics();