1.安全管理报表

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/pom.xml

@@ -50,5 +50,10 @@
 			<groupId>com.yeejoin</groupId>
 			<artifactId>amos-component-rule</artifactId>
 		</dependency>
+	  <dependency>
+		  <groupId>com.google.zxing</groupId>
+		  <artifactId>javase</artifactId>
+		  <version>3.3.0</version>
+	  </dependency>
   </dependencies>
 </project>

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.equipmanage.common.dto.AnalysisReportLogDto;
 import com.yeejoin.equipmanage.service.IFireAutoSysManageReportService;
-import com.yeejoin.equipmanage.service.IFirePatrolReportService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -38,7 +37,7 @@ public class FireAutoSysManageReportController extends BaseController {
 
     @ApiOperation(value = "下载报表", notes = "下载报表")
     @GetMapping(value = "/download")
-    @TycloudOperation(ApiLevel = UserType.PUBLIC, needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     public void download(HttpServletRequest request, HttpServletResponse response,
                          @ApiParam(value = "换流站编码", required = true) @RequestParam String stationCode,
                          @ApiParam(value = "开始日期", required = true) @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
@@ -48,7 +47,7 @@ public class FireAutoSysManageReportController extends BaseController {
 
     @ApiOperation(value = "预览报表", notes = "预览报表")
     @GetMapping(value = "/preview")
-    @TycloudOperation(ApiLevel = UserType.PUBLIC)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     public String preview(
             @ApiParam(value = "换流站编码", required = true) @RequestParam String stationCode,
             @ApiParam(value = "开始日期", required = true) @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
@@ -59,7 +58,7 @@ public class FireAutoSysManageReportController extends BaseController {
     @SuppressWarnings("unchecked")
     @ApiOperation(value = "所有站查询列表", notes = "所有站查询列表")
     @GetMapping(value = "/allPage")
-    @TycloudOperation(ApiLevel = UserType.PUBLIC)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     public IPage<AnalysisReportLogDto> allPage(Page page, @RequestParam Integer reportType,
                                                @ApiParam(value = "开始日期") @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
                                                @ApiParam(value = "结束日期") @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate,

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

@@ -277,6 +277,7 @@ public class FilePatrolReportServiceImpl implements IFirePatrolReportService {
 	 */
 	public static StandardChartTheme createChartTheme(String fontName) {
 		StandardChartTheme theme = new StandardChartTheme("unicode") {
+			@Override
 			public void apply(JFreeChart chart) {
 				chart.getRenderingHints().put(RenderingHints.KEY_TEXT_ANTIALIASING,
 						RenderingHints.VALUE_TEXT_ANTIALIAS_OFF);
@@ -379,9 +380,10 @@ public class FilePatrolReportServiceImpl implements IFirePatrolReportService {
 		WordTemplateUtils instance = WordTemplateUtils.getInstance();
 		Map<String, Object> map = getWordMap(code, startDate, endDate);
 		String urlString="";
+		File filepdf = null;
 		try {
 			//instance.pdfCreate(map, (String) map.get("document_number"), WordTemplateTypeEum.firePatrolReport.getTemplateFile());
-			File filepdf = instance.getWordFileItem(map,(String) map.get("document_number"), WordTemplateTypeEum.firePatrolReport.getTemplateFile());
+			filepdf = instance.getWordFileItem(map,(String) map.get("document_number"), WordTemplateTypeEum.firePatrolReport.getTemplateFile());
 			//MultipartFile multipartFile = new CommonsMultipartFile(item);
 			filepdf.getAbsolutePath();
 //            File file = new File("F:\\application-dev.yml");
@@ -396,6 +398,10 @@ public class FilePatrolReportServiceImpl implements IFirePatrolReportService {
 	    		}
 		} catch (IOException e) {
 			e.printStackTrace();
+		} finally {
+			if(filepdf != null){
+				filepdf.delete();
+			}
 		}
 		return urlString;
 	}

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

@@ -259,8 +259,9 @@ public class FireAutoSysManageReportServiceImpl implements IFireAutoSysManageRep
         WordTemplateUtils instance = WordTemplateUtils.getInstance();
         Map<String, Object> map = getWordMap(code, startDate, endDate);
         String urlString = "";
+        File filePdf = null;
         try {
-            File filePdf = instance.getWordFileItem(map, (String) map.get("document_number"), WordTemplateTypeEum.fireAutoSysManageReport.getTemplateFile());
+            filePdf = instance.getWordFileItem(map, "消防自动化综合管理报表", WordTemplateTypeEum.fireAutoSysManageReport.getTemplateFile());
             MultipartFile multipartFile = new MyByteArrayMultipartFile("file", "file.pdf", "application/pdf", file2byte(filePdf));
             FeignClientResult<Map<String, String>> result = Systemctl.fileStorageClient.updateCommonFile(multipartFile);
             if (result != null) {
@@ -270,6 +271,10 @@ public class FireAutoSysManageReportServiceImpl implements IFireAutoSysManageRep
             }
         } catch (IOException e) {
             e.printStackTrace();
+        } finally {
+            if(filePdf != null){
+                filePdf.delete();
+            }
         }
         return urlString;
     }