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 | 32 +++++++++++++-------------------
1 files changed, 13 insertions(+), 19 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 0973b6f..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,8 +118,17 @@
*/
@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);
}
@@ -151,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);
--
Gitblit v1.9.3