From 2e4a5ceda924d410d08632ec3bd8c6d42cf5bc08 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:22:09 +0800
Subject: [PATCH] 白蚁预警发短信7-19 12
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/skPanorama/controller/SkPanoramaController.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/skPanorama/controller/SkPanoramaController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/skPanorama/controller/SkPanoramaController.java
index bba7d9f..0973b6f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/skPanorama/controller/SkPanoramaController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/skPanorama/controller/SkPanoramaController.java
@@ -122,6 +122,13 @@
return R.data(pages);
}
+// @GetMapping("/page")
+// @ApiOperation(value = "分页", notes = "传入skPanorama")
+// public R<IPage<SkPanoramaVO>> page2(SkPanoramaVO skPanorama, Query query) {
+// IPage<SkPanoramaVO> pages = skPanoramaService.selectSkPanoramaPage(Condition.getPage(query), skPanorama);
+// return R.data(pages);
+// }
+
/**
* 水库全景图 新增
*/
@@ -430,7 +437,10 @@
private static final String linShiformateBaseUrl = "/data/panorama/formate/";
@PostMapping("/formatePic")
public R formatePic(@RequestParam String ids) throws IOException, InterruptedException, IM4JavaException {
+ System.err.println(ids);
+
List<Long> idlist = Func.toLongList(ids);
+
ArrayList<SkPanoramaEntity> panoramalist = new ArrayList<SkPanoramaEntity>();
@@ -476,7 +486,10 @@
HashMap<String, Integer> imgInfoRT = Img4JavaUtil.getImgInfoRT(lingshiqjfile);
Integer width = imgInfoRT.get("width");
Integer height = imgInfoRT.get("height");
+ System.err.println(id);
+ System.err.println("图片分辨率："+ width +" * " + height);
if (width == height * 2) {
+ System.err.println("符合标准");
// 已经符合格式化标准
SkPanoramaEntity upEntity = new SkPanoramaEntity();
upEntity.setId(id);
@@ -484,6 +497,14 @@
upEntity.setPicwidth(width);
upEntity.setStatus(PanoramaUtilDict.panorama_status_2);
justUpdateStatusList.add(upEntity);
+
+ // 完成格式化后删除原始临时图片
+ Path qietuPath = Paths.get(lingshiPic);
+ File yuanspic = qietuPath.toFile();
+ if (yuanspic.exists()) {
+ // 删除指定文件，不存在报异常
+ FileUtils.forceDelete(yuanspic);
+ }
// boolean b = skPanoramaService.updateById(upEntity);
// return R.status( b);
} else {
@@ -538,16 +559,18 @@
}
}
+
+ System.err.println("panoramalist:"+panoramalist.size());
boolean b = false;
if (panoramalist != null && panoramalist.size()>0) {
b = skPanoramaService.updateBatchById(panoramalist);
} else {
b = true;
}
-
+ System.err.println("justUpdateStatusList:"+justUpdateStatusList.size());
boolean formatB = false;
// 已上传的全景图已符合比例，仅用改变数据状态
- if (panoramalist != null && panoramalist.size()>0) {
+ if (justUpdateStatusList != null && justUpdateStatusList.size()>0) {
formatB = skPanoramaService.updateBatchById(justUpdateStatusList);
} else {
formatB = true;
--
Gitblit v1.9.3