diff --git a/lzbi-module/src/main/java/com/lzbi/bi/controller/DcBusiDataScreenMainController.java b/lzbi-module/src/main/java/com/lzbi/bi/controller/DcBusiDataScreenMainController.java index c8530b4..2b452c9 100644 --- a/lzbi-module/src/main/java/com/lzbi/bi/controller/DcBusiDataScreenMainController.java +++ b/lzbi-module/src/main/java/com/lzbi/bi/controller/DcBusiDataScreenMainController.java @@ -10,7 +10,7 @@ import com.lzbi.common.core.controller.BaseController; import com.lzbi.common.core.domain.AjaxResult; import com.lzbi.common.core.domain.TreeSelect; import com.lzbi.common.core.domain.entity.SysDept; -import com.lzbi.draft.domain.req.ReportDataReq; +import com.lzbi.bi.domain.req.ReportDataReq; import com.lzbi.system.service.impl.SysDeptServiceImpl; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; @@ -110,6 +110,16 @@ public class DcBusiDataScreenMainController extends BaseController{ return AjaxResult.success(dcBusiDataScreenMainService.selectSomeOrgSomeMultiReportYearlyDataMultiEchart(reportDataReq)); } + /** + * 查询地图上的组织列表 + * @param reportDataReq + * @return + */ + @PostMapping("/getMapOrgList") + public AjaxResult selectMapOrgList(@Validated @RequestBody ReportDataReq reportDataReq) { + return AjaxResult.success(dcBusiDataScreenMainService.selectMapOrgList(reportDataReq)); + } + /** * 获取天气信息 */ diff --git a/lzbi-module/src/main/java/com/lzbi/bi/controller/DcBusiDataScreenNewController.java b/lzbi-module/src/main/java/com/lzbi/bi/controller/DcBusiDataScreenNewController.java index aa93542..b4b0e02 100644 --- a/lzbi-module/src/main/java/com/lzbi/bi/controller/DcBusiDataScreenNewController.java +++ b/lzbi-module/src/main/java/com/lzbi/bi/controller/DcBusiDataScreenNewController.java @@ -3,7 +3,7 @@ package com.lzbi.bi.controller; import com.lzbi.bi.service.DcBusiDataScreenNewService; import com.lzbi.common.core.controller.BaseController; import com.lzbi.common.core.domain.AjaxResult; -import com.lzbi.draft.domain.req.ReportDataReq; +import com.lzbi.bi.domain.req.ReportDataReq; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/dto/SomeOrgSomedayMultiReportDataDTO.java b/lzbi-module/src/main/java/com/lzbi/bi/domain/dto/SomeOrgSomedayMultiReportDataDTO.java similarity index 92% rename from lzbi-module/src/main/java/com/lzbi/draft/domain/dto/SomeOrgSomedayMultiReportDataDTO.java rename to lzbi-module/src/main/java/com/lzbi/bi/domain/dto/SomeOrgSomedayMultiReportDataDTO.java index 6d55bbf..7b82e32 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/domain/dto/SomeOrgSomedayMultiReportDataDTO.java +++ b/lzbi-module/src/main/java/com/lzbi/bi/domain/dto/SomeOrgSomedayMultiReportDataDTO.java @@ -1,4 +1,4 @@ -package com.lzbi.draft.domain.dto; +package com.lzbi.bi.domain.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/dto/SomeTypeChildrenOrgSomedayMultiReportDataDTO.java b/lzbi-module/src/main/java/com/lzbi/bi/domain/dto/SomeTypeChildrenOrgSomedayMultiReportDataDTO.java similarity index 94% rename from lzbi-module/src/main/java/com/lzbi/draft/domain/dto/SomeTypeChildrenOrgSomedayMultiReportDataDTO.java rename to lzbi-module/src/main/java/com/lzbi/bi/domain/dto/SomeTypeChildrenOrgSomedayMultiReportDataDTO.java index 61cd7b2..966d459 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/domain/dto/SomeTypeChildrenOrgSomedayMultiReportDataDTO.java +++ b/lzbi-module/src/main/java/com/lzbi/bi/domain/dto/SomeTypeChildrenOrgSomedayMultiReportDataDTO.java @@ -1,4 +1,4 @@ -package com.lzbi.draft.domain.dto; +package com.lzbi.bi.domain.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/req/ReportDataReq.java b/lzbi-module/src/main/java/com/lzbi/bi/domain/req/ReportDataReq.java similarity index 95% rename from lzbi-module/src/main/java/com/lzbi/draft/domain/req/ReportDataReq.java rename to lzbi-module/src/main/java/com/lzbi/bi/domain/req/ReportDataReq.java index 00caab8..2f9f959 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/domain/req/ReportDataReq.java +++ b/lzbi-module/src/main/java/com/lzbi/bi/domain/req/ReportDataReq.java @@ -1,4 +1,4 @@ -package com.lzbi.draft.domain.req; +package com.lzbi.bi.domain.req; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/vo/ChildrenOrgSomedaySomeReportDataVO.java b/lzbi-module/src/main/java/com/lzbi/bi/domain/vo/ChildrenOrgSomedaySomeReportDataVO.java similarity index 93% rename from lzbi-module/src/main/java/com/lzbi/draft/domain/vo/ChildrenOrgSomedaySomeReportDataVO.java rename to lzbi-module/src/main/java/com/lzbi/bi/domain/vo/ChildrenOrgSomedaySomeReportDataVO.java index 558909e..9dbfe62 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/domain/vo/ChildrenOrgSomedaySomeReportDataVO.java +++ b/lzbi-module/src/main/java/com/lzbi/bi/domain/vo/ChildrenOrgSomedaySomeReportDataVO.java @@ -1,4 +1,4 @@ -package com.lzbi.draft.domain.vo; +package com.lzbi.bi.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/lzbi-module/src/main/java/com/lzbi/bi/domain/vo/MapOrgVO.java b/lzbi-module/src/main/java/com/lzbi/bi/domain/vo/MapOrgVO.java new file mode 100644 index 0000000..c9b85ee --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/bi/domain/vo/MapOrgVO.java @@ -0,0 +1,22 @@ +package com.lzbi.bi.domain.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + * 地图组织 + */ +@AllArgsConstructor +@NoArgsConstructor +@Data +public class MapOrgVO { + + private Long orgId; + + private String orgName; + + private BigDecimal number; +} diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/vo/SomeOrgSomeReportYearlyDataVO.java b/lzbi-module/src/main/java/com/lzbi/bi/domain/vo/SomeOrgSomeReportYearlyDataVO.java similarity index 93% rename from lzbi-module/src/main/java/com/lzbi/draft/domain/vo/SomeOrgSomeReportYearlyDataVO.java rename to lzbi-module/src/main/java/com/lzbi/bi/domain/vo/SomeOrgSomeReportYearlyDataVO.java index e2bf51e..b300db3 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/domain/vo/SomeOrgSomeReportYearlyDataVO.java +++ b/lzbi-module/src/main/java/com/lzbi/bi/domain/vo/SomeOrgSomeReportYearlyDataVO.java @@ -1,4 +1,4 @@ -package com.lzbi.draft.domain.vo; +package com.lzbi.bi.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/vo/SomeOrgSomedayMultiReportDataVO.java b/lzbi-module/src/main/java/com/lzbi/bi/domain/vo/SomeOrgSomedayMultiReportDataVO.java similarity index 91% rename from lzbi-module/src/main/java/com/lzbi/draft/domain/vo/SomeOrgSomedayMultiReportDataVO.java rename to lzbi-module/src/main/java/com/lzbi/bi/domain/vo/SomeOrgSomedayMultiReportDataVO.java index a6c745e..30c5bc3 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/domain/vo/SomeOrgSomedayMultiReportDataVO.java +++ b/lzbi-module/src/main/java/com/lzbi/bi/domain/vo/SomeOrgSomedayMultiReportDataVO.java @@ -1,4 +1,4 @@ -package com.lzbi.draft.domain.vo; +package com.lzbi.bi.domain.vo; import lombok.Data; diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/vo/SomeOrgSomedaySomeReportDataVO.java b/lzbi-module/src/main/java/com/lzbi/bi/domain/vo/SomeOrgSomedaySomeReportDataVO.java similarity index 92% rename from lzbi-module/src/main/java/com/lzbi/draft/domain/vo/SomeOrgSomedaySomeReportDataVO.java rename to lzbi-module/src/main/java/com/lzbi/bi/domain/vo/SomeOrgSomedaySomeReportDataVO.java index dae8725..a3a51ae 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/domain/vo/SomeOrgSomedaySomeReportDataVO.java +++ b/lzbi-module/src/main/java/com/lzbi/bi/domain/vo/SomeOrgSomedaySomeReportDataVO.java @@ -1,4 +1,4 @@ -package com.lzbi.draft.domain.vo; +package com.lzbi.bi.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/lzbi-module/src/main/java/com/lzbi/bi/mapper/DcBusiDataScreenMainMapper.java b/lzbi-module/src/main/java/com/lzbi/bi/mapper/DcBusiDataScreenMainMapper.java index e507b20..b12f694 100644 --- a/lzbi-module/src/main/java/com/lzbi/bi/mapper/DcBusiDataScreenMainMapper.java +++ b/lzbi-module/src/main/java/com/lzbi/bi/mapper/DcBusiDataScreenMainMapper.java @@ -3,13 +3,12 @@ package com.lzbi.bi.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.lzbi.bi.domain.DcBusiDataScreenDto; -import com.lzbi.bi.domain.DcBusiDataScreenVo; -import com.lzbi.draft.domain.dto.SomeOrgSomedayMultiReportDataDTO; -import com.lzbi.draft.domain.dto.SomeTypeChildrenOrgSomedayMultiReportDataDTO; -import com.lzbi.draft.domain.req.ReportDataReq; -import com.lzbi.draft.domain.vo.ChildrenOrgSomedaySomeReportDataVO; -import com.lzbi.draft.domain.vo.SomeOrgSomeReportYearlyDataVO; -import com.lzbi.draft.domain.vo.SomeOrgSomedaySomeReportDataVO; +import com.lzbi.bi.domain.dto.SomeOrgSomedayMultiReportDataDTO; +import com.lzbi.bi.domain.dto.SomeTypeChildrenOrgSomedayMultiReportDataDTO; +import com.lzbi.bi.domain.req.ReportDataReq; +import com.lzbi.bi.domain.vo.ChildrenOrgSomedaySomeReportDataVO; +import com.lzbi.bi.domain.vo.SomeOrgSomeReportYearlyDataVO; +import com.lzbi.bi.domain.vo.SomeOrgSomedaySomeReportDataVO; import java.util.List; diff --git a/lzbi-module/src/main/java/com/lzbi/bi/mapper/ScreenMockDataMapper.java b/lzbi-module/src/main/java/com/lzbi/bi/mapper/ScreenMockDataMapper.java index 31070a9..171fd0e 100644 --- a/lzbi-module/src/main/java/com/lzbi/bi/mapper/ScreenMockDataMapper.java +++ b/lzbi-module/src/main/java/com/lzbi/bi/mapper/ScreenMockDataMapper.java @@ -1,13 +1,14 @@ package com.lzbi.bi.mapper; import com.alibaba.fastjson2.JSONObject; +import com.lzbi.bi.domain.vo.MapOrgVO; import com.lzbi.common.constant.BizConstants; -import com.lzbi.draft.domain.dto.SomeOrgSomedayMultiReportDataDTO; -import com.lzbi.draft.domain.dto.SomeTypeChildrenOrgSomedayMultiReportDataDTO; -import com.lzbi.draft.domain.req.ReportDataReq; -import com.lzbi.draft.domain.vo.ChildrenOrgSomedaySomeReportDataVO; -import com.lzbi.draft.domain.vo.SomeOrgSomeReportYearlyDataVO; -import com.lzbi.draft.domain.vo.SomeOrgSomedaySomeReportDataVO; +import com.lzbi.bi.domain.dto.SomeOrgSomedayMultiReportDataDTO; +import com.lzbi.bi.domain.dto.SomeTypeChildrenOrgSomedayMultiReportDataDTO; +import com.lzbi.bi.domain.req.ReportDataReq; +import com.lzbi.bi.domain.vo.ChildrenOrgSomedaySomeReportDataVO; +import com.lzbi.bi.domain.vo.SomeOrgSomeReportYearlyDataVO; +import com.lzbi.bi.domain.vo.SomeOrgSomedaySomeReportDataVO; import org.springframework.stereotype.Component; import java.math.BigDecimal; @@ -169,4 +170,14 @@ public class ScreenMockDataMapper { result.add(new SomeOrgSomeReportYearlyDataVO("联网面积", "2024", BigDecimal.valueOf(50))); return result; } + + public List selectMapOrgList(ReportDataReq reportDataReq) { + List result = new ArrayList<>(); + result.add(new MapOrgVO(103L, "沈阳浑南热力有限责任公司", BigDecimal.valueOf(1000))); + result.add(new MapOrgVO(104L, "沈阳国新环保新能源有限责任公司", BigDecimal.valueOf(1002))); + result.add(new MapOrgVO(107L, "沈阳国润低碳有限责任公司", BigDecimal.valueOf(1300))); + result.add(new MapOrgVO(210L, "沈阳新北热电", BigDecimal.valueOf(1101))); + result.add(new MapOrgVO(214L, "沈阳国惠低碳", BigDecimal.valueOf(1134))); + return result; + } } diff --git a/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiDataScreenMainService.java b/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiDataScreenMainService.java index 4f84027..5b0382d 100644 --- a/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiDataScreenMainService.java +++ b/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiDataScreenMainService.java @@ -8,18 +8,18 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.lzbi.bi.domain.DcBusiDataScreenDto; import com.lzbi.bi.domain.SysDeptLocation; +import com.lzbi.bi.domain.vo.*; import com.lzbi.bi.mapper.DcBusiDataScreenMainMapper; import com.lzbi.bi.mapper.ScreenMockDataMapper; import com.lzbi.common.constant.BizConstants; import com.lzbi.common.core.domain.entity.SysDept; import com.lzbi.common.enums.ReportNameEnum; -import com.lzbi.draft.domain.dto.SomeOrgSomedayMultiReportDataDTO; -import com.lzbi.draft.domain.dto.SomeTypeChildrenOrgSomedayMultiReportDataDTO; -import com.lzbi.draft.domain.req.ReportDataReq; +import com.lzbi.bi.domain.dto.SomeOrgSomedayMultiReportDataDTO; +import com.lzbi.bi.domain.dto.SomeTypeChildrenOrgSomedayMultiReportDataDTO; +import com.lzbi.bi.domain.req.ReportDataReq; import com.lzbi.draft.domain.vo.*; import com.lzbi.draft.service.DcBusiTargetDraftDaynewService; import com.lzbi.system.service.ISysDeptService; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -185,6 +185,10 @@ public class DcBusiDataScreenMainService extends ServiceImpl selectMapOrgList(ReportDataReq reportDataReq) { + return baseMapper.selectMapOrgList(reportDataReq); + } + /** * 查询某组织某天多图表数据DTO列表 * @param reportDataReq diff --git a/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiDataScreenNewService.java b/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiDataScreenNewService.java index 4c96400..ca6d60d 100644 --- a/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiDataScreenNewService.java +++ b/lzbi-module/src/main/java/com/lzbi/bi/service/DcBusiDataScreenNewService.java @@ -6,7 +6,7 @@ import com.lzbi.common.constant.BizConstants; import com.lzbi.common.core.domain.entity.SysDept; import com.lzbi.common.enums.ReportNameEnum; import com.lzbi.draft.domain.vo.TargetDraftDaynewAggregateResVo; -import com.lzbi.draft.domain.req.ReportDataReq; +import com.lzbi.bi.domain.req.ReportDataReq; import com.lzbi.draft.domain.vo.TargetDraftDaynewResVo; import com.lzbi.draft.domain.vo.TargetDraftMonthAggregateResVo; import com.lzbi.draft.mapper.DcBusiTargetDraftMonthMapper; diff --git a/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetDraftDaynewMapper.java b/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetDraftDaynewMapper.java index 2180a85..97b2079 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetDraftDaynewMapper.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetDraftDaynewMapper.java @@ -5,7 +5,7 @@ import com.lzbi.bill.domain.DcBusiTargetInputMaster; import com.lzbi.draft.domain.DcBusiTargetDraftDaynew; import com.lzbi.draft.domain.vo.TargetDraftDayRangeResVo; import com.lzbi.draft.domain.vo.TargetDraftDaynewAggregateResVo; -import com.lzbi.draft.domain.req.ReportDataReq; +import com.lzbi.bi.domain.req.ReportDataReq; import com.lzbi.draft.domain.vo.TargetDraftDaynewResVo; import org.apache.ibatis.annotations.Param; diff --git a/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetDraftMonthMapper.java b/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetDraftMonthMapper.java index bc07e3e..a3845f7 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetDraftMonthMapper.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetDraftMonthMapper.java @@ -5,7 +5,7 @@ import java.util.List; import com.lzbi.bill.domain.DcBusiTargetInputMaster; import com.lzbi.draft.domain.DcBusiTargetDraftMonth; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.lzbi.draft.domain.req.ReportDataReq; +import com.lzbi.bi.domain.req.ReportDataReq; import com.lzbi.draft.domain.vo.TargetDraftMonthAggregateResVo; import org.apache.ibatis.annotations.Param; diff --git a/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiTargetDraftDaynewService.java b/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiTargetDraftDaynewService.java index 5a882f1..4e61ef8 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiTargetDraftDaynewService.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiTargetDraftDaynewService.java @@ -6,7 +6,7 @@ import com.lzbi.common.utils.DateUtils; import com.lzbi.draft.domain.DcBusiTargetDraftDaynew; import com.lzbi.draft.domain.vo.TargetDraftDayRangeResVo; import com.lzbi.draft.domain.vo.TargetDraftDaynewAggregateResVo; -import com.lzbi.draft.domain.req.ReportDataReq; +import com.lzbi.bi.domain.req.ReportDataReq; import com.lzbi.draft.domain.vo.TargetDraftDaynewResVo; import com.lzbi.draft.mapper.DcBusiTargetDraftDaynewMapper; import org.springframework.stereotype.Service; diff --git a/lzbi-module/src/main/resources/mapper/DcBusiDataScreenMainMapper.xml b/lzbi-module/src/main/resources/mapper/DcBusiDataScreenMainMapper.xml index 6f10858..1251b8f 100644 --- a/lzbi-module/src/main/resources/mapper/DcBusiDataScreenMainMapper.xml +++ b/lzbi-module/src/main/resources/mapper/DcBusiDataScreenMainMapper.xml @@ -315,8 +315,8 @@ + - select d.organize_name as cname, d.value_result as value_result, @@ -328,7 +328,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by md.max_date - select d.organize_name, d.organize_id, diff --git a/lzbi-module/src/main/resources/mapper/asset/DcBusiTargetDraftMonthMapper.xml b/lzbi-module/src/main/resources/mapper/asset/DcBusiTargetDraftMonthMapper.xml index 4830fc7..c8b505f 100644 --- a/lzbi-module/src/main/resources/mapper/asset/DcBusiTargetDraftMonthMapper.xml +++ b/lzbi-module/src/main/resources/mapper/asset/DcBusiTargetDraftMonthMapper.xml @@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - select d.org_name, d.org_id,