From e0bbf735bdb6582b18e2489bf518c095def088f5 Mon Sep 17 00:00:00 2001 From: 15856 <15856818120@163.com> Date: Thu, 5 Dec 2024 13:54:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LargeScreenController.java | 2 +- .../largeScreen/mapper/LargeScreenMapper.java | 3 +- .../service/impl/LargeScreenServiceImpl.java | 4 +- .../sgzb/material/domain/EquipmentDis.java | 20 ++++++++ .../sgzb/material/domain/EquipmentDisVo.java | 51 +++++++++++++++++++ .../mapper/largeScreen/LargeScreenMapper.xml | 8 ++- 6 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/EquipmentDis.java create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/EquipmentDisVo.java diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/controller/LargeScreenController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/controller/LargeScreenController.java index 8158914..d0fdda7 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/controller/LargeScreenController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/controller/LargeScreenController.java @@ -71,7 +71,7 @@ public class LargeScreenController extends BaseController { } } - @Log(title = "设备分布图",businessType = BusinessType.QUERY) + @Log(title = "获取省份信息",businessType = BusinessType.QUERY) @PostMapping("getEquipmentDisByMap") public AjaxResult getEquipmentDisByMap(ParamsDto dto) { return service.getEquipmentDisByMap(dto); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/mapper/LargeScreenMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/mapper/LargeScreenMapper.java index c370c7c..bdb9b6c 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/mapper/LargeScreenMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/mapper/LargeScreenMapper.java @@ -1,6 +1,7 @@ package com.bonus.sgzb.largeScreen.mapper; import com.bonus.sgzb.largeScreen.domain.*; +import com.bonus.sgzb.material.domain.EquipmentDis; import org.springframework.stereotype.Repository; import java.util.List; @@ -47,7 +48,7 @@ public interface LargeScreenMapper { * @author cwchen * @date 2023/12/13 15:04 */ - List getEquipmentDisByMap(ParamsDto dto); + List getEquipmentDisByMap(ParamsDto dto); /** * @param dto diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java index 39a1bea..4580a53 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java @@ -6,6 +6,7 @@ import com.bonus.sgzb.largeScreen.domain.*; import com.bonus.sgzb.largeScreen.mapper.LargeScreenMapper; import com.bonus.sgzb.largeScreen.service.ILargeScreenService; import com.bonus.sgzb.largeScreen.util.CommonUtil; +import com.bonus.sgzb.material.domain.EquipmentDis; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -70,7 +71,8 @@ public class LargeScreenServiceImpl implements ILargeScreenService { public AjaxResult getEquipmentDisByMap(ParamsDto dto) { List list = new ArrayList<>(); try { - + List equipmentDisByMap = mapper.getEquipmentDisByMap(dto); + return AjaxResult.success(equipmentDisByMap); } catch (Exception e) { log.error("设备分布", e); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/EquipmentDis.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/EquipmentDis.java new file mode 100644 index 0000000..20aa278 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/EquipmentDis.java @@ -0,0 +1,20 @@ +package com.bonus.sgzb.material.domain; + +import lombok.Data; + +/** + * @author 10488 + * 设备分布-VO + */ +@Data +public class EquipmentDis { + /** + * 省份 + */ + private String province; + /** + * 工程数量 + */ + private Integer num; + +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/EquipmentDisVo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/EquipmentDisVo.java new file mode 100644 index 0000000..614b77f --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/EquipmentDisVo.java @@ -0,0 +1,51 @@ +package com.bonus.sgzb.material.domain; + +import lombok.Data; + +import java.util.List; + +/** + * @author 10488 + * 设备分布-VO + */ +@Data +public class EquipmentDisVo { + + /** + * 经度 + */ + private String lon; + + /** + * 维度 + */ + private String lat; + + /** + * 工程名称 + */ + private String lotName; + /** + * 工程id + */ + private Integer lotId; + + /** + * 机具类型名称 + */ + private String typeName; + /** + * 省份 + */ + private String province; + /** + * 工程数量 + */ + private Integer num; + + private String longitude; + private String latitude; + private String address; + + List EquipmentDisList; +} diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml index 7a957bd..9990a73 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml @@ -41,7 +41,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - +