save

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

@@ -166,7 +166,6 @@ public class FzssServiceImpl implements IFzssService {
         // 0.开始规划,更新任务状态
         updateFzxzStatus(taskId, Rwzt.getRun());
 
-
         // 开始分析
         iLogService.saveLog(taskId, "辅助选址", "开始分析", "info");
         List<String> factorBsmList = new ArrayList<>();

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

@@ -33,12 +33,10 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.imageio.ImageIO;
-import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.*;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.List;
 
 /**
  * 生成报告
@@ -207,50 +205,6 @@ public class ReportServiceImpl implements IReportService {
             }
             NpoiHelper.setComTable(document, tabYzTitles, dataTablelist, "表1：选址影响因子", pos++);
 
-            // // 生成因子图片
-            // for (FzxzFactorDTO rootFactor : rootFactors) {
-            //     if (factorImageMap.containsKey(rootFactor.getId())) {
-            //         List<FactorUseDTO> factorUseDTOS = factorImageMap.get(rootFactor.getId());
-            //         List<WktsVo.WktInfo> wktInfos = new ArrayList<>();
-            //         for (FactorUseDTO factorUseDTO : factorUseDTOS) {
-            //             if (factorUseDTO.getFactorName().equals("坡度") || factorUseDTO.getFactorName().equals("高程"))
-            //                 continue;
-            //             String ewkt = getFactorWkt(geomRes.getGeom(), factorUseDTO.getFactorBsm());
-            //
-            //             Random random = new Random();
-            //             int rgb = random.nextInt(0xFFFFFF + 1);
-            //             String color = String.format("#%06X", rgb);
-            //
-            //
-            //             WktsVo.WktInfo wktInfo = new WktsVo.WktInfo();
-            //             wktInfo.setWkt(ewkt);
-            //             wktInfo.setBorderColor(color);
-            //             wktInfo.setBorderColor(color);
-            //
-            //             wktInfos.add(wktInfo);
-            //         }
-            //         if (wktInfos.size() == 0) continue;
-            //
-            //         String imagePath = reportImg(wktInfos);
-            //         if (imagePath.equals("")) continue;
-            //         // 获取插入图片
-            //         NpoiHelper.content(document, rootFactor.getName(), pos++, ParagraphAlignment.CENTER);
-            //         ReportImage reportImage = getPathImage(imagePath, 400);
-            //
-            //         XWPFParagraph imageParagraph = document.createParagraph();
-            //         imageParagraph.setAlignment(ParagraphAlignment.CENTER); // Center align the image
-            //         XWPFRun imageRun = imageParagraph.createRun();
-            //         imageRun.addPicture(reportImage.getInputStream(), XWPFDocument.PICTURE_TYPE_PNG, null, Units.toEMU(reportImage.getUseWidth()), Units.toEMU(reportImage.getUseHeight()));
-            //         pos++;
-            //     }
-            // }
-            //
-            // // 添加分页
-            // XWPFParagraph pageBreakParagraph0 = document.createParagraph();
-            // XWPFRun pageBreakRun0 = pageBreakParagraph0.createRun();
-            // pageBreakRun0.addBreak(BreakType.PAGE);
-            // pos++;
-
             // TODO 二、选址范围分析
             NpoiHelper.catalog(document, "二、选址范围分析", pos++);
             String fwfx = "\t根据指定选址分析得出，所选范围共" + NumberUtil.double2TwoDecimal(UnitsUtil.m2ToMu(geomRes.getArea())) + "亩，其中";