From ec78dbddbf0159a0d5f285b87977a32ea765fda0 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 26 Jul 2024 15:13:27 +0800
Subject: [PATCH] 全景图和白蚁报警：7-26 15
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/skPanorama/controller/SkPanoramaController.java | 59 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 38 insertions(+), 21 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..0555c7b 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
@@ -22,6 +22,7 @@
import cn.gistack.resource.entity.QieTuEntity;
import cn.gistack.resource.feign.IOssClient;
import cn.gistack.sm.skPanorama.entity.ParamEntity;
+import cn.gistack.sm.skPanorama.entity.SkPicCountEntity;
import cn.gistack.sm.skPanorama.utils.Img4JavaUtil;
import cn.gistack.sm.skPanorama.utils.PanoramaUtilDict;
import cn.gistack.sm.skPanoramaState.entity.SkPanoramaStateEntity;
@@ -117,10 +118,26 @@
*/
@GetMapping("/page")
@ApiOperation(value = "分页", notes = "传入skPanorama")
- public R<IPage<SkPanoramaVO>> page(SkPanoramaVO skPanorama, Query query) {
- IPage<SkPanoramaVO> pages = skPanoramaService.selectSkPanoramaPage(Condition.getPage(query), skPanorama);
+ public R<IPage<SkPicCountEntity>> page(SkPicCountEntity skPanorama, Query query) {
+ Integer current = query.getCurrent();
+ Integer size = query.getSize();
+ IPage<SkPicCountEntity> page = Condition.getPage(query);
+
+// System.err.println("current:"+current);
+// System.err.println("size:"+size);
+ Integer startIndex = (current -1) * size;
+ Integer endIndex = current * size;
+
+ IPage<SkPicCountEntity> pages = skPanoramaService.selectPageR( page,startIndex, endIndex, skPanorama);
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);
+// }
/**
* 水库全景图 新增
@@ -144,23 +161,7 @@
List<SkPanoramaStateEntity> updateList = new ArrayList<>();
List<SkPanoramaStateEntity> addList = new ArrayList<>();
if (stateLsit != null && stateLsit.size()>0) {
-// for (SkPanoramaStateEntity item :stateLsit) {
-// Long id = item.getId();
-// if (id != null) {
-// // 更新
-// updateList.add(item);
-// } else {
-// // 新增
-// addList.add(item);
-// }
-// }
-// boolean b = true;
-// if (addList != null) {
-// b = skPanoramaStateService.saveBatch(addList);
-// }
-// if (updateList != null) {
-// b = skPanoramaStateService.saveOrUpdateBatch(updateList);
-// }
+
boolean b =skPanoramaStateService.saveOrUpdateBatch(stateLsit);
return R.status(b);
@@ -430,7 +431,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 +480,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 +491,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 +553,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