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

@@ -81,7 +81,7 @@ public class HgxfxJgReportServiceImpl implements HgxfxJgReportService {
             factorMap00.put("YXYZMCⅢ", "");
             factorMap00.put("YXZ", "");
             if (factorMap != null) {
-                factorMap00 = factorMap;
+                factorMap00.putAll(factorMap);
             }
             if (level == 0) {
                 factorMap00.put("YXYZMCI", scxname);

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/fzss/hgxfxjg/HgxfxHandleService.java

@@ -60,7 +60,7 @@ public class HgxfxHandleService {
         hgxfxDTO.setRwzt(1);
         hgxfxMapper.update(hgxfxDTO, v1_update);
 
-        insertFxrwrz(StringUtils.getUUID(), bsm, hgxfxDTO.getXmmc(), "合规性分析开始。。。");
+        insertFxrwrz(StringUtils.getUUID(), bsm, hgxfxDTO.getXmmc(), "合规性分析开始。。。", "info");
         getHgxfxScx(bsm, ewkt, "0");
 
 
@@ -76,7 +76,7 @@ public class HgxfxHandleService {
         analyseService.hgxfxGenerateDocx(hgxfxReportVo);
 
         //更新结束时间
-        insertFxrwrz(StringUtils.getUUID(), bsm, hgxfxDTO.getXmmc(), "合规性分析结束。。。");
+        insertFxrwrz(StringUtils.getUUID(), bsm, hgxfxDTO.getXmmc(), "合规性分析结束。。。", "info");
         hgxfxDTO.setRwjssj(new Date());
         hgxfxDTO.setRwzt(2);
         hgxfxMapper.update(hgxfxDTO, v1_update);
@@ -131,12 +131,12 @@ public class HgxfxHandleService {
             }
             getHgxfxScx(rwbsm, ewkt, v01_scx.getScxbsm());
             // 任务开始时间
-            insertFxrwrz(bsm, rwbsm, scxName, null);
+            insertFxrwrz(bsm, rwbsm, scxName, null, "info");
         }
         return 0;
     }
 
-    private void insertFxrwrz(String bsm, String rwbsm, String scxName, String rznr) {
+    private void insertFxrwrz(String bsm, String rwbsm, String scxName, String rznr, String rzlx) {
         //添加记录
         FxrwrzDTO fxrwrzDTO = new FxrwrzDTO();
         fxrwrzDTO.setBsm(bsm);
@@ -147,6 +147,7 @@ public class HgxfxHandleService {
         } else {
             fxrwrzDTO.setRzlr(scxName + "完成");
         }
+        fxrwrzDTO.setRzlx(rzlx);
         fxrwrzDTO.setRzsj(new Date());
         fxrwrzMapper.insert(fxrwrzDTO);
     }

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 = 400;
+            int w = 1000;
             int h = (int) (w * (combinedBounds.getHeight() / combinedBounds.getWidth()));
             BufferedImage bufferedImage = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
             Graphics2D g2d = bufferedImage.createGraphics();