修改导出文档接口

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-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>