From 3effe18114109be2a71ed10e1d093194dcc52a09 Mon Sep 17 00:00:00 2001 From: haotian <2421912570@qq.com> Date: Tue, 15 Apr 2025 11:22:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9--=E4=BA=A7=E5=93=81=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=BC=98=E5=8C=96=E8=8E=B7=E5=8F=96=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E4=BD=8D=E6=A6=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backstage/SysSourceController.java | 5 +++-- .../ruoyi/system/domain/dto/HotSourceDto.java | 19 +++++++++++++++++++ .../mapper/system/SysSourceMapper.xml | 4 +++- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java index a513a628..afa1ab03 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java @@ -295,11 +295,12 @@ public class SysSourceController extends BaseController { // List hotSourceDtoList = new ArrayList<>(); - // 获取前10名 + // 获取前6名 List sysSourceList = sysSourceService.getHotSource(); for(HotSourceDto sysSource : sysSourceList){ - sysSource.setNumber(sysSource.getPart()+"区"+sysSource.getScale()+sysSource.getCoordinate()); + + sysSource.setNumber(sysSource.getPart()+sysSource.getScale()+String.format("%02d%02d", sysSource.getcX(), sysSource.getcY())); } return success(sysSourceList); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/HotSourceDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/HotSourceDto.java index 26460ce4..2776f294 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/HotSourceDto.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/HotSourceDto.java @@ -9,6 +9,8 @@ public class HotSourceDto { private String scale; private String number; private String coordinate; + private int cX; + private int cY; private Long bBought; public Long getSourceId() { @@ -77,6 +79,23 @@ public class HotSourceDto { this.coordinate = coordinate; } + public int getcX() { + return cX; + } + + public void setcX(int cX) { + this.cX = cX; + } + + public int getcY() { + return cY; + } + + public void setcY(int cY) { + this.cY = cY; + } + + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml index 718bd310..97eb9395 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml @@ -51,6 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -137,7 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"