From 01cf6cbac4a338da18342448d5b8803afeafccf2 Mon Sep 17 00:00:00 2001 From: haotian <2421912570@qq.com> Date: Mon, 17 Feb 2025 10:44:55 +0800 Subject: [PATCH] =?UTF-8?q?AR--=E4=BF=AE=E6=94=B9--=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=BD=8D=E4=BF=A1=E6=81=AF=E6=97=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BD=9C=E5=93=81=E5=90=8D=E5=92=8C=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/app/AppARController.java | 34 ++----------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppARController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppARController.java index b10330bd..f431a83b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppARController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppARController.java @@ -3,6 +3,7 @@ package com.ruoyi.web.controller.app; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.system.domain.SysScenic; import com.ruoyi.system.domain.SysSource; +import com.ruoyi.system.domain.dto.ShowSysSourceARListDto; import com.ruoyi.system.domain.dto.ShowSysSourceListDto; import com.ruoyi.system.service.ISysSourceService; import org.springframework.beans.factory.annotation.Autowired; @@ -33,40 +34,11 @@ public class AppARController { System.out.println("AR发送数据: "+sysSource.getCity()+sysSource.getScenic()); + List showSysSourceList = sysSourceService.getSysSourceARList(sysSource); - - int horizontalCount = 0; - int verticalCount = 0; - - List sysSourceList = sysSourceService.selectSysSourceList(sysSource); - - // 这里写的也太迂回了吧, 就这样吧 -// ShowSysSourceDto showSysSource = new ShowSysSourceDto(); - List showSysSourceList = new ArrayList<>(); - - System.out.println("sysSourceList: "+sysSourceList.size()); - for(SysSource sysSource1 : sysSourceList){ -// // 没必要解析price数据 -// sysSource1.setPriceList(GsonUtils.fromJson(sysSource1.getPrice(), List.class)); - ShowSysSourceListDto showSysSourceListDto = new ShowSysSourceListDto(); - showSysSourceListDto.setSourceId(sysSource1.getSourceId()); - showSysSourceListDto.setPart(sysSource1.getPart()); - showSysSourceListDto.setcX(sysSource1.getcX()); - showSysSourceListDto.setcY(sysSource1.getcY()); - showSysSourceListDto.setSourceStatus(sysSource1.getSourceStatus()); - showSysSourceListDto.setWorkAddress(sysSource1.getWorkAddress()); - - horizontalCount = Math.max(sysSource1.getcX(), horizontalCount); - verticalCount = Math.max(sysSource1.getcY(), verticalCount); - - showSysSourceList.add(showSysSourceListDto); - - } - AjaxResult ajaxResult = AjaxResult.success(); - ajaxResult.put("horizontalCount", horizontalCount+1); - ajaxResult.put("verticalCount", verticalCount+1); + ajaxResult.put("sourceList", showSysSourceList); return ajaxResult;