修改导出文档接口

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -79,7 +79,7 @@ public class ControllerAop {
         // 不需要添加请求头的接口
         String[] url = new String[]{"/api/user/save/curCompany", "/jcs/command/lookHtmlText",
                 "/jcs/common/duty-person/findByDutyAreaId", "/tzs/wechatBack", "/tzs/elevator/getElevatorInfo",
-                "/openapi/bizToken/applyToken"};
+                "/openapi/bizToken/applyToken","/fire-patrol-report/download","/fire-patrol-report/allPage"};
         // 获取请求路径
         for (String uri : url) {
             if (request.getRequestURI().indexOf(uri) != -1) {

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/dto/AnalysisReportLogDto.java

@@ -8,10 +8,12 @@ import lombok.Data;
 public class AnalysisReportLogDto extends AnalysisReportLog{
 
 	private static final long serialVersionUID = 214456306850625504L;
-	 @ApiModelProperty(value = "主键")
-	 String reportName;
-	 @ApiModelProperty(value = "主键")
-	 String stationName;
-	 @ApiModelProperty(value = "主键")
-	 String reportTypeName;
+	@ApiModelProperty(value = "换流站编码")
+     private String stationCode;
+	 @ApiModelProperty(value = "报告名称")
+	 private String reportName;
+	 @ApiModelProperty(value = "换流站名称")
+	 private String stationName;
+	 @ApiModelProperty(value = "报告类型名称")
+	 private String reportTypeName;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/AnalysisReportLog.java

@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.common.entity;
 
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.annotation.FillCommonUserField;
 import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
@@ -46,5 +47,4 @@ public class AnalysisReportLog extends BaseEntity {
     @ApiModelProperty(value = "结束时间")
     private Date endDate;
 
-
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FirePatrolReportController.java

 package com.yeejoin.equipmanage.controller;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 
 import javax.servlet.http.HttpServletRequest;
@@ -17,6 +19,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.equipmanage.common.dto.AnalysisReportLogDto;
+import com.yeejoin.equipmanage.common.entity.AnalysisReportLog;
 import com.yeejoin.equipmanage.service.IFirePatrolReportService;
 
 import io.swagger.annotations.Api;
@@ -48,11 +51,25 @@ public class FirePatrolReportController {
 	}
 	
 	@ApiOperation(value = "所有站查询列表", notes = "所有站查询列表")
-	@GetMapping(value = "/all-page")
+	@GetMapping(value = "/allPage")
 	@TycloudOperation(ApiLevel = UserType.PUBLIC, needAuth = false)
 	public IPage<AnalysisReportLogDto> allPage(Page page, @RequestParam Integer reportType,
-			@ApiParam(value = "开始日期", required = false) @RequestParam @DateTimeFormat(pattern="yyyy-MM-dd")Date startDate,
-			@ApiParam(value = "结束日期", required = false) @RequestParam @DateTimeFormat(pattern="yyyy-MM-dd")Date endDate) {
-		return iFirePatrolReportService.allPage(page,reportType, startDate, endDate);
+			@ApiParam(value = "开始日期", required = false) @RequestParam(required = false) @DateTimeFormat(pattern="yyyy-MM-dd")Date startDate,
+			@ApiParam(value = "结束日期", required = false) @RequestParam(required = false) @DateTimeFormat(pattern="yyyy-MM-dd")Date endDate,
+			@ApiParam(value = "换流站编码", required = false) @RequestParam(required = false) String stationCode) {
+		return iFirePatrolReportService.allPage(page,reportType, startDate, endDate,stationCode);
 	}
+	
+//	/**
+//	 * 分页接口
+//	 */
+//	@ApiOperation(httpMethod = "GET", value = "单站查询列表", notes = "单站查询列表")
+//    @GetMapping(value = "/listPage")
+//	@TycloudOperation(ApiLevel = UserType.PUBLIC, needAuth = false)
+//	public IPage<AnalysisReportLog> listPage(Page page, @RequestParam Integer reportType,
+//			@ApiParam(value = "开始日期", required = false) @RequestParam @DateTimeFormat(pattern="yyyy-MM-dd")Date startDate,
+//			@ApiParam(value = "结束日期", required = false) @RequestParam @DateTimeFormat(pattern="yyyy-MM-dd")Date endDate,
+//			@RequestParam String stationCode) throws ParseException {
+//		return iFirePatrolReportService.listPage(page,reportType, startDate, endDate,stationCode);
+//	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IFirePatrolReportService.java

@@ -14,7 +14,7 @@ public interface IFirePatrolReportService {
 
 	void download(HttpServletRequest request, HttpServletResponse response,String code,Date startDate,Date endDate);
 	
-	IPage<AnalysisReportLogDto> allPage(Page<AnalysisReportLogDto> page, Integer reportType,Date startDate,Date endDate);
-
+	IPage<AnalysisReportLogDto> allPage(Page<AnalysisReportLogDto> page, Integer reportType,Date startDate,Date endDate,String stationCode);
 
+	//IPage<AnalysisReportLogDto> listPage(Page<AnalysisReportLogDto> page, Integer reportType,Date startDate,Date endDate,String stationCode);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FilePatrolReportServiceImpl.java

@@ -2,9 +2,18 @@ package com.yeejoin.equipmanage.service.impl;
 
 import java.awt.Color;
 import java.awt.Font;
+import java.awt.Paint;
+import java.awt.PaintContext;
+import java.awt.Rectangle;
 import java.awt.RenderingHints;
+import java.awt.Stroke;
+import java.awt.font.TextAttribute;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
+import java.awt.image.ColorModel;
 import java.io.IOException;
+import java.text.AttributedString;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -17,14 +26,19 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.swing.border.StrokeBorder;
 
 import org.jfree.chart.ChartFactory;
 import org.jfree.chart.ChartUtilities;
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.StandardChartTheme;
+import org.jfree.chart.StrokeMap;
+import org.jfree.chart.labels.PieSectionLabelGenerator;
 import org.jfree.chart.labels.StandardPieSectionLabelGenerator;
 import org.jfree.chart.plot.PiePlot;
+import org.jfree.chart.title.LegendTitle;
 import org.jfree.data.general.DefaultPieDataset;
+import org.jfree.data.general.PieDataset;
 import org.jfree.ui.RectangleEdge;
 import org.jfree.ui.RectangleInsets;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,7 +60,7 @@ public class FilePatrolReportServiceImpl implements IFirePatrolReportService {
 
 	@Autowired
 	AnalysisReportLogMapper analysisReportLogMapper;
-	
+
 	@Override
 	public void download(HttpServletRequest request, HttpServletResponse response, String code, Date startDate,
 			Date endDate) {
@@ -115,31 +129,31 @@ public class FilePatrolReportServiceImpl implements IFirePatrolReportService {
 		DefaultPieDataset pds = new DefaultPieDataset();
 		pds.setValue("合格", qualified);
 		pds.setValue("不合格", no_qualified);
-		String qualified_pie_chart = getChartString(pds,"合格情况占比");
+		String qualified_pie_chart = getChartString(pds, "合格情况占比");
 		map.put("qualified_pie_chart", qualified_pie_chart);
 		// 设备巡查饼图
 		DefaultPieDataset pds2 = new DefaultPieDataset();
 		pds2.setValue("已查询设备", checked_equipment_count);
 		pds2.setValue("漏查设备", unchecked_equipment_count);
-		String equip_pie_chart = getChartString(pds2,"设备巡查占比");
+		String equip_pie_chart = getChartString(pds2, "设备巡查占比");
 		map.put("equip_pie_chart", equip_pie_chart);
 		// 业务主题
 		map.put("business_title", "消防巡查");
 		// 缺陷清单
-		List<Map<String,Object>> defect_list = new ArrayList<>();
-		Map<String,Object> defectMap = new HashMap<>();
+		List<Map<String, Object>> defect_list = new ArrayList<>();
+		Map<String, Object> defectMap = new HashMap<>();
 		defectMap.put("defect_location", "主控楼一层");
 		defectMap.put("defect_description", "仅有一条疏散通道，存在重大火灾隐患，不满足规范要求。");
 		defectMap.put("rectified_progress", "待评审");
 		defectMap.put("remark", "无法整改");
 		defect_list.add(defectMap);
-		Map<String,Object> defectMap2 = new HashMap<>();
+		Map<String, Object> defectMap2 = new HashMap<>();
 		defectMap2.put("defect_location", "主控楼一层");
 		defectMap2.put("defect_description", "防火卷帘门故障；11个水泵接合器存在问题；");
 		defectMap2.put("rectified_progress", "待治理");
 		defectMap2.put("remark", "防火卷帘已完成维修，水泵接合器未整改");
 		defect_list.add(defectMap2);
-		Map<String,Object> defectMap3 = new HashMap<>();
+		Map<String, Object> defectMap3 = new HashMap<>();
 		defectMap3.put("defect_location", "主控楼一层库房区域");
 		defectMap3.put("defect_description", "将办公用房作为库房使用，使用性质与原设计不符，耐火等级和相应消防设施不满足规范要求。");
 		defectMap3.put("rectified_progress", "治理完毕");
@@ -154,60 +168,88 @@ public class FilePatrolReportServiceImpl implements IFirePatrolReportService {
 		}
 	}
 
-    /**
-    * 生成主题
-    *
-    * @param fontName 字体名称（默认为宋体）
-    * @return
-    */
-   public static StandardChartTheme createChartTheme(String fontName) {
-       StandardChartTheme theme = new StandardChartTheme("unicode") {
-           public void apply(JFreeChart chart) {
-               chart.getRenderingHints().put(RenderingHints.KEY_TEXT_ANTIALIASING,
-                       RenderingHints.VALUE_TEXT_ANTIALIAS_OFF);
-               super.apply(chart);
-           }
-       };
-       fontName = StrUtil.isBlank(fontName) ? "宋体" : fontName;
-       theme.setExtraLargeFont(new Font(fontName, Font.PLAIN, 20));
-       theme.setLargeFont(new Font(fontName, Font.PLAIN, 14));
-       theme.setRegularFont(new Font(fontName, Font.PLAIN, 12));
-       theme.setSmallFont(new Font(fontName, Font.PLAIN, 10));
-       return theme;
+	/**
+	 * 生成主题
+	 *
+	 * @param fontName 字体名称（默认为宋体）
+	 * @return
+	 */
+	public static StandardChartTheme createChartTheme(String fontName) {
+		StandardChartTheme theme = new StandardChartTheme("unicode") {
+			public void apply(JFreeChart chart) {
+				chart.getRenderingHints().put(RenderingHints.KEY_TEXT_ANTIALIASING,
+						RenderingHints.VALUE_TEXT_ANTIALIAS_OFF);
+				super.apply(chart);
+			}
+		};
+		fontName = StrUtil.isBlank(fontName) ? "宋体" : fontName;
+		theme.setExtraLargeFont(new Font(fontName, Font.PLAIN, 20));
+		theme.setLargeFont(new Font(fontName, Font.PLAIN, 14));
+		theme.setRegularFont(new Font(fontName, Font.PLAIN, 12));
+		theme.setSmallFont(new Font(fontName, Font.PLAIN, 10));
+		return theme;
 
-   }
+	}
 
 	/**
 	 * 获取饼图base64字符串
+	 * 
 	 * @param pds
 	 * @return
 	 */
-	private String getChartString(DefaultPieDataset pds,String title) {
-		//设置主题 要不会乱码
+	private String getChartString(DefaultPieDataset pds, String title) {
+		// 设置主题 要不会乱码
 		ChartFactory.setChartTheme(createChartTheme("微软雅黑"));
 		JFreeChart chart = ChartFactory.createPieChart(title, pds, true, false, true);
-		chart.getLegend().setPosition(RectangleEdge.BOTTOM);
-		RectangleInsets padding = new RectangleInsets(20,20,20,20);
+		// 设置图例
+		LegendTitle legend = chart.getLegend();
+		legend.setPosition(RectangleEdge.BOTTOM);
+		// 设置图例边框
+		legend.setBorder(0, 0, 0, 0);
+		legend.setItemFont(new Font("微软雅黑", Font.PLAIN, 16));
+		// 设置最外层边框
+		chart.setBorderVisible(false);
+		RectangleInsets padding = new RectangleInsets(40, 40, 40, 40);
 		chart.setPadding(padding);
 		// 如果不使用Font,中文将显示不出来
-		Font font = new Font("微软雅黑", Font.BOLD, 16);
 		// 设置图片标题的字体
-		chart.getTitle().setFont(font);
+		chart.getTitle().setFont(new Font("微软雅黑", Font.BOLD, 24));
 		// 得到图块,准备设置标签的字体
 		PiePlot plot = (PiePlot) chart.getPlot();
-		// 设置标签字体
-		plot.setLabelFont(font);
-		plot.setStartAngle(180);
-        plot.setSectionPaint(pds.getKey(0),Color.RED);
-        plot.setSectionPaint(pds.getKey(1),Color.BLUE);
+		// 设置饼图阴影
+		plot.setShadowPaint(Color.WHITE);
+		plot.setAutoPopulateSectionOutlinePaint(true);
+		// 设置饼图边框
+		plot.setOutlineVisible(false);
+		// 设置饼图一定是正圆
+		plot.setCircular(true);
+		// 设置起始角度
+		plot.setStartAngle(90);
+		// 设置饼图颜色
+		plot.setSectionPaint(pds.getKey(0), Color.RED);
+		plot.setSectionPaint(pds.getKey(1), Color.BLUE);
+		// 设置饼图边框颜色
+
 		// 设置plot的前景色透明度
 		plot.setForegroundAlpha(0.7f);
 		// 设置plot的背景色透明度
 		plot.setBackgroundAlpha(0.0f);
+		// 设置标签字体
+		plot.setLabelFont(new Font("微软雅黑", Font.PLAIN, 16));
+		// 设置分类标签字体颜色
+		// plot.setLabelPaint(Color.RED);
+		//plot.setLabelLinkPaint(Color.RED);
+		// 设置分类标签背景颜色
+		plot.setLabelBackgroundPaint(Color.WHITE);
+		// 设置分类标签边框颜色
+		plot.setLabelOutlinePaint(Color.WHITE);
+		plot.setLabelShadowPaint(Color.WHITE);
 		// 设置标签生成器(默认{0})
 		// {0}:key {1}:value {2}:百分比 {3}:sum
-		plot.setLabelGenerator(new StandardPieSectionLabelGenerator("{0}\n{2}"));
-		BufferedImage image = chart.createBufferedImage(800, 600);
+		StandardPieSectionLabelGenerator labelGenerator = new StandardPieSectionLabelGenerator("{0}\n{2}");
+		plot.setLabelGenerator(labelGenerator);
+		
+		BufferedImage image = chart.createBufferedImage(600,350);
 		byte[] bytes = null;
 		try {
 			bytes = ChartUtilities.encodeAsPNG(image);
@@ -218,12 +260,26 @@ public class FilePatrolReportServiceImpl implements IFirePatrolReportService {
 		return base64;
 	}
 
+
 	@Override
-	public IPage<AnalysisReportLogDto> allPage(Page<AnalysisReportLogDto> page, Integer reportType, Date startDate, Date endDate) {
-		AnalysisReportLog analysisReportLog = new AnalysisReportLog();
+	public IPage<AnalysisReportLogDto> allPage(Page<AnalysisReportLogDto> page, Integer reportType, Date startDate,
+			Date endDate, String stationCode) {
+		AnalysisReportLogDto analysisReportLog = new AnalysisReportLogDto();
 		analysisReportLog.setStartDate(startDate);
 		analysisReportLog.setEndDate(endDate);
 		analysisReportLog.setReportType(reportType);
+		analysisReportLog.setStationCode(stationCode);
 		return analysisReportLogMapper.allPage(page, analysisReportLog);
 	}
+
+//	@Override
+//	public IPage<AnalysisReportLogDto> listPage(Page<AnalysisReportLogDto> page, Integer reportType, Date startDate,
+//			Date endDate,String stationCode) {
+//		AnalysisReportLogDto analysisReportLog = new AnalysisReportLogDto();
+//		analysisReportLog.setReportType(reportType);
+//		analysisReportLog.setStationCode(stationCode);
+//		analysisReportLog.setEndDate(startDate);
+//		analysisReportLog.setStartDate(endDate);
+//		return analysisReportLogMapper.allPage(page, analysisReportLog);
+//	}
 }

amos-boot-system-equip/src/main/resources/ftl/FirePatrolReport.ftl

@@ -3705,7 +3705,7 @@
                                 <w:pict>
                                     <w:binData w:name="wordml://1.png">${(qualified_pie_chart)!''}
 </w:binData>
-                                    <v:shape id="_x0000_s1027" o:spt="75" alt="" type="#_x0000_t75" style="height:255.7pt;width:416.45pt;" filled="f" o:preferrelative="t" stroked="f" coordsize="21600,21600">
+                                    <v:shape id="_x0000_s1027" o:spt="75" alt="" type="#_x0000_t75" style="height:240pt;width:414.95pt;" filled="f" o:preferrelative="t" stroked="f" coordsize="21600,21600">
                                         <v:path/>
                                         <v:fill on="f" focussize="0,0"/>
                                         <v:stroke on="f"/>
@@ -3728,7 +3728,7 @@
                                 <w:pict>
                                     <w:binData w:name="wordml://2.png">${(equip_pie_chart)!''}
 </w:binData>
-                                    <v:shape id="_x0000_s1028" o:spt="75" alt="" type="#_x0000_t75" style="height:236.7pt;width:414.95pt;" filled="f" o:preferrelative="t" stroked="f" coordsize="21600,21600">
+                                    <v:shape id="_x0000_s1028" o:spt="75" alt="" type="#_x0000_t75" style="height:240pt;width:414.95pt;" filled="f" o:preferrelative="t" stroked="f" coordsize="21600,21600">
                                         <v:path/>
                                         <v:fill on="f" focussize="0,0"/>
                                         <v:stroke on="f"/>

amos-boot-system-equip/src/main/resources/mapper/AnalysisReportLogMapper.xml

@@ -26,6 +26,9 @@
 			 <if test="analysisReportLog.endDate != null">
 			 AND DATE_FORMAT(wl_analysis_report_log.end_date, '%Y-%m-%d') &lt;= DATE_FORMAT(#{analysisReportLog.endDate}, '%Y-%m-%d')   
 			 </if>
+			 <if test="analysisReportLog.stationCode != null">
+			 AND cb_org_usr.biz_org_code = #{analysisReportLog.stationCode} 
+			 </if>
 		</where>  
     </select>
 </mapper>