From 81b6acbefce89eaca136cc0a0fbb1f3ca28ef322 Mon Sep 17 00:00:00 2001 From: mashuai Date: Sun, 3 Dec 2023 11:19:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=A8=A1=E5=9D=97=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BmCompanyInfoController.java | 60 +++++++++++++------ .../controller/BmMachinistInfoController.java | 21 +++---- .../controller/MaDevInfoController.java | 23 ++++++- .../controller/MaLeaseInfoController.java | 11 +++- .../zlpt/bigscreen/domain/vo/ColtdTypeVo.java | 7 ++- .../zlpt/bigscreen/domain/vo/ColtdVo.java | 23 +++++++ .../bigscreen/domain/vo/CompanyInfoVo.java | 16 ----- .../bonus/zlpt/bigscreen/domain/vo/LonVo.java | 23 +++++++ .../bigscreen/mapper/BmCompanyInfoMapper.java | 6 -- .../mapper/BmMachinistInfoMapper.java | 1 + .../service/BmCompanyInfoService.java | 6 -- .../service/BmMachinistInfoService.java | 1 + .../impl/BmCompanyInfoServiceImpl.java | 8 --- .../impl/BmMachinistInfoServiceImpl.java | 1 + .../src/main/resources/bootstrap.yml | 7 --- .../resources/mapper/BmCompanyInfoMapper.xml | 18 +++--- .../mapper/BmMachinistInfoMapper.xml | 1 - .../main/resources/mapper/MaDevInfoMapper.xml | 9 +-- 18 files changed, 147 insertions(+), 95 deletions(-) create mode 100644 zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/ColtdVo.java create mode 100644 zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/LonVo.java diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmCompanyInfoController.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmCompanyInfoController.java index 57c40a7..f69ab16 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmCompanyInfoController.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmCompanyInfoController.java @@ -1,5 +1,7 @@ package com.bonus.zlpt.bigscreen.controller; +import com.bonus.zlpt.bigscreen.domain.vo.ColtdVo; +import com.bonus.zlpt.bigscreen.domain.vo.LonVo; import com.bonus.zlpt.common.core.web.controller.BaseController; import com.bonus.zlpt.common.core.web.domain.AjaxResult; import com.bonus.zlpt.bigscreen.domain.vo.CoTypeVo; @@ -8,7 +10,10 @@ import com.bonus.zlpt.bigscreen.service.BmCompanyInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 企业信息表(BmCompanyInfo)表控制层 @@ -26,36 +31,57 @@ public class BmCompanyInfoController extends BaseController { private BmCompanyInfoService bmCompanyInfoService; /** - * 查询平台入驻单位 - * @return - */ - @GetMapping("/list") - public AjaxResult List() - { - return toAjax(bmCompanyInfoService.selectList()); - } - - /** - * 根据企业类型查询对应数量 + * 根据企业类型查询对应数量以及总数量 + * * @param * @return */ @GetMapping("/type-list") - public AjaxResult typeList() - { + public AjaxResult typeList() { List list = bmCompanyInfoService.selectTypeList(); - return success(list); + HashMap map = new HashMap<>(3); + int totalCount = 0; + for (CoTypeVo coTypeVo : list) { + totalCount += coTypeVo.getCount(); + } + map.put("total", totalCount); + for (CoTypeVo coTypeVo : list) { + if (coTypeVo.getCoType().equals("社会企业")) { + map.put("social", coTypeVo); + } else if (coTypeVo.getCoType().equals("南网集团企业")) { + map.put("grid", coTypeVo); + } else { + map.put("corporation", coTypeVo); + } + } + return success(map); } /** * 根据企业类型所属查询设备类型数量及经纬度 + * * @return */ @GetMapping("/coltd-list") - public AjaxResult coltdList() - { + public AjaxResult coltdList() { + List list = bmCompanyInfoService.selectColtdList(); - return success(list); + + Map> map = new HashMap<>(); + for (ColtdTypeVo coltdTypeVo : list) { + + String companyType = coltdTypeVo.getCompanyType(); + map.put(companyType, map.getOrDefault(companyType, new HashMap<>())); + map.get(companyType).putIfAbsent("自有", new ColtdVo()); + map.get(companyType).putIfAbsent("在租", new ColtdVo()); + map.get(companyType).putIfAbsent("待租", new ColtdVo()); + + ColtdVo coltdVo = map.get(companyType).get(coltdTypeVo.getMaStatus()); + coltdVo.setCount(coltdVo.getCount() + 1); + coltdVo.getList().add(new LonVo(coltdTypeVo.getMaId(), coltdTypeVo.getLon(), coltdTypeVo.getLat())); + + } + return success(map); } } diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmMachinistInfoController.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmMachinistInfoController.java index 2fd561d..cca18b4 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmMachinistInfoController.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/BmMachinistInfoController.java @@ -7,7 +7,9 @@ import com.bonus.zlpt.bigscreen.service.BmMachinistInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 机手信息表(BmMachinistInfo)表控制层 @@ -25,29 +27,22 @@ public class BmMachinistInfoController extends BaseController { private BmMachinistInfoService bmMachinistInfoService; /** - * 获取企业所属对应的机手数量 + * 获取企业所属对应的机手数量以及机手总人数 * @return */ @GetMapping("/list") public AjaxResult list() - { - List machinistInfos = bmMachinistInfoService.selectMachinistInfoList(); - return success(machinistInfos); - } - - /** - * 获取企业所属对应的机手总人数 - * @return - */ - @GetMapping("/total-list") - public AjaxResult totalList() { List machinistInfos = bmMachinistInfoService.selectMachinistInfoList(); int totalCount = 0; for (CompanyInfoVo companyInfo : machinistInfos) { totalCount += companyInfo.getCount(); } - return toAjax(totalCount); + Map map = new HashMap<>(2); + map.put("total", totalCount); + map.put("type", machinistInfos); + return success(map); } + } diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaDevInfoController.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaDevInfoController.java index bcef660..087617f 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaDevInfoController.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaDevInfoController.java @@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.HashMap; import java.util.List; /** @@ -35,7 +36,7 @@ public class MaDevInfoController extends BaseController { @GetMapping("/list") public AjaxResult List() { - return toAjax(maDevInfoService.selectList()); + return success(maDevInfoService.selectList()); } /** @@ -47,7 +48,15 @@ public class MaDevInfoController extends BaseController { public AjaxResult typeList() { List list = maDevInfoService.selectTypeList(); - return success(list); + HashMap map = new HashMap<>(2); + for (TypeVo typeVo : list) { + if (typeVo.getMaStatus().equals("自有")){ + map.put("self", typeVo); + } else { + map.put("rent", typeVo); + } + } + return success(map); } /** @@ -59,7 +68,15 @@ public class MaDevInfoController extends BaseController { public AjaxResult maTypeList() { List list = maDevInfoService.selectMaTypeList(); - return success(list); + HashMap map = new HashMap<>(2); + for (TypeVo typeVo : list) { + if (typeVo.getMaStatus().equals("在租")){ + map.put("use", typeVo); + } else { + map.put("rent", typeVo); + } + } + return success(map); } /** diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaLeaseInfoController.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaLeaseInfoController.java index e0f6f7e..c450e30 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaLeaseInfoController.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaLeaseInfoController.java @@ -8,6 +8,7 @@ import com.bonus.zlpt.bigscreen.service.MaLeaseInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.List; /** @@ -34,7 +35,15 @@ public class MaLeaseInfoController extends BaseController { public AjaxResult typeList(MaLeaseInfo maLeaseInfo) { List list = maLeaseInfoService.selectTypeList(maLeaseInfo); - return success(list); + HashMap map = new HashMap<>(); + for (MaLeaseInfoVo leaseInfoVo : list) { + if (leaseInfoVo.getType().equals("出租")) { + map.put("rent", leaseInfoVo); + } else { + map.put("wantRent", leaseInfoVo); + } + } + return success(map); } } diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/ColtdTypeVo.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/ColtdTypeVo.java index 6e349c1..d7a6348 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/ColtdTypeVo.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/ColtdTypeVo.java @@ -7,8 +7,6 @@ import lombok.Data; */ @Data public class ColtdTypeVo { - //设备id - private String maId; //企业类型所属 private String companyType; @@ -17,7 +15,10 @@ public class ColtdTypeVo { private String maStatus; //数量 - private String count; + private Integer count; + + //设备id + private Integer maId; //经度 private String lon; diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/ColtdVo.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/ColtdVo.java new file mode 100644 index 0000000..16d47ba --- /dev/null +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/ColtdVo.java @@ -0,0 +1,23 @@ +package com.bonus.zlpt.bigscreen.domain.vo; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * 总数以及经纬度集合vo + */ +@Data +public class ColtdVo { + + public ColtdVo(){ + this.count = 0; + this.list = new ArrayList<>(); + } + + //总数 + private int count; + //经纬度 + private List list; +} diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/CompanyInfoVo.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/CompanyInfoVo.java index ce1efd4..70f68cd 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/CompanyInfoVo.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/CompanyInfoVo.java @@ -1,6 +1,5 @@ package com.bonus.zlpt.bigscreen.domain.vo; - import lombok.Data; /** @@ -15,19 +14,4 @@ public class CompanyInfoVo { //机手数量 private int count; - public String getOwnCo() { - return ownCo; - } - - public void setOwnCo(String ownCo) { - this.ownCo = ownCo; - } - - public int getCount() { - return count; - } - - public void setCount(int count) { - this.count = count; - } } diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/LonVo.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/LonVo.java new file mode 100644 index 0000000..793b0e8 --- /dev/null +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/domain/vo/LonVo.java @@ -0,0 +1,23 @@ +package com.bonus.zlpt.bigscreen.domain.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 经纬度分解实体vo + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class LonVo { + + //设备id + private Integer maId; + + //经度 + private String lon; + + //维度 + private String lat; +} diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/BmCompanyInfoMapper.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/BmCompanyInfoMapper.java index 798d2b0..e8defc8 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/BmCompanyInfoMapper.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/BmCompanyInfoMapper.java @@ -15,12 +15,6 @@ import java.util.List; @Mapper public interface BmCompanyInfoMapper { - /** - * 查询平台入驻单位 - * @return - */ - int selectList(); - /** * 根据企业类型查询对应数量 * @param diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/BmMachinistInfoMapper.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/BmMachinistInfoMapper.java index dcd6ce3..d14e07e 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/BmMachinistInfoMapper.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/mapper/BmMachinistInfoMapper.java @@ -4,6 +4,7 @@ import com.bonus.zlpt.bigscreen.domain.vo.CompanyInfoVo; import org.apache.ibatis.annotations.Mapper; import java.util.List; +import java.util.Map; /** * 机手信息表(BmMachinistInfo)表数据库访问层 diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/BmCompanyInfoService.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/BmCompanyInfoService.java index 78d81c2..d4c53a9 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/BmCompanyInfoService.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/BmCompanyInfoService.java @@ -13,12 +13,6 @@ import java.util.List; */ public interface BmCompanyInfoService { - /** - * 查询平台入驻单位 - * @return - */ - int selectList(); - /** * 根据企业类型查询对应数量 * @param diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/BmMachinistInfoService.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/BmMachinistInfoService.java index 73b9332..8f9bdca 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/BmMachinistInfoService.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/BmMachinistInfoService.java @@ -3,6 +3,7 @@ package com.bonus.zlpt.bigscreen.service; import com.bonus.zlpt.bigscreen.domain.vo.CompanyInfoVo; import java.util.List; +import java.util.Map; /** * 机手信息表(BmMachinistInfo)表服务接口 diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/BmCompanyInfoServiceImpl.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/BmCompanyInfoServiceImpl.java index f6578d3..ce837ce 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/BmCompanyInfoServiceImpl.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/BmCompanyInfoServiceImpl.java @@ -20,14 +20,6 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService { @Autowired private BmCompanyInfoMapper bmCompanyInfoMapper; - /** - * 查询平台入驻单位 - * @return - */ - @Override - public int selectList() { - return bmCompanyInfoMapper.selectList(); - } /** * 根据企业类型查询对应数量 diff --git a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/BmMachinistInfoServiceImpl.java b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/BmMachinistInfoServiceImpl.java index 79232f9..f972c17 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/BmMachinistInfoServiceImpl.java +++ b/zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/service/impl/BmMachinistInfoServiceImpl.java @@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * 机手信息表(BmMachinistInfo)表服务实现类 diff --git a/zlpt-modules/zlpt-bigScreen/src/main/resources/bootstrap.yml b/zlpt-modules/zlpt-bigScreen/src/main/resources/bootstrap.yml index 62a6f56..b6efb82 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/resources/bootstrap.yml +++ b/zlpt-modules/zlpt-bigScreen/src/main/resources/bootstrap.yml @@ -4,13 +4,6 @@ server: # Spring spring: - datasource: - # 主库数据源 - master: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.0.14:2009/ma_zlpt?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true - username: root - password: Bonus@admin123! application: # 应用名称 name: zlpt-bigScreen diff --git a/zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/BmCompanyInfoMapper.xml b/zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/BmCompanyInfoMapper.xml index 746684b..7a745fd 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/BmCompanyInfoMapper.xml +++ b/zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/BmCompanyInfoMapper.xml @@ -4,10 +4,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - SELECT - c.company_ltd AS companyType, - m.ma_status AS maStatus, - COUNT(m.ma_id) AS count, + c.company_ltd AS companyType, + m.ma_status AS maStatus, + COUNT(m.ma_id) AS count, g.lon AS lon, - g.lat AS lat + g.lat AS lat, + m.ma_id AS maId FROM ma_dev_info m JOIN bm_company_info c ON m.own_co = c.company_id JOIN gps_real_info g ON m.gps_code = g.gps_code WHERE - m.ma_status IN ('在租', '自用', '待租') + m.ma_status IN ('在租', '自有', '待租') GROUP BY - c.company_ltd, m.ma_status, g.lon, g.lat + c.company_ltd, m.ma_status, g.lon, g.lat,maId + diff --git a/zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/BmMachinistInfoMapper.xml b/zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/BmMachinistInfoMapper.xml index a17bef1..22a14a5 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/BmMachinistInfoMapper.xml +++ b/zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/BmMachinistInfoMapper.xml @@ -10,5 +10,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN bm_operator_info m ON c.company_name = m.own_co GROUP BY c.company_ltd - \ No newline at end of file diff --git a/zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/MaDevInfoMapper.xml b/zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/MaDevInfoMapper.xml index deecedc..3778741 100644 --- a/zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/MaDevInfoMapper.xml +++ b/zlpt-modules/zlpt-bigScreen/src/main/resources/mapper/MaDevInfoMapper.xml @@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT mti.type_name as maName, COUNT(*) as count + SELECT mti.type_name as ownCo, COUNT(*) as count FROM ma_type_info mti INNER JOIN ma_dev_info mdi ON mti.type_id = mdi.type_id WHERE mdi.ma_status = '在租' @@ -43,10 +43,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"