1、更改一些实体类的包

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));
+    }
+
     /**
      * 获取天气信息
      */

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;

lzbi-module/src/main/java/com/lzbi/draft/domain/dto/SomeOrgSomedayMultiReportDataDTO.java → 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;

lzbi-module/src/main/java/com/lzbi/draft/domain/dto/SomeTypeChildrenOrgSomedayMultiReportDataDTO.java → 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;

lzbi-module/src/main/java/com/lzbi/draft/domain/req/ReportDataReq.java → 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;

lzbi-module/src/main/java/com/lzbi/draft/domain/vo/ChildrenOrgSomedaySomeReportDataVO.java → 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;

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;
+}

lzbi-module/src/main/java/com/lzbi/draft/domain/vo/SomeOrgSomeReportYearlyDataVO.java → 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;

lzbi-module/src/main/java/com/lzbi/draft/domain/vo/SomeOrgSomedayMultiReportDataVO.java → 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;
 

lzbi-module/src/main/java/com/lzbi/draft/domain/vo/SomeOrgSomedaySomeReportDataVO.java → 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;

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.bi.domain.dto.SomeOrgSomedayMultiReportDataDTO;
-import com.lzbi.draft.domain.dto.SomeOrgSomedayMultiReportDataDTO;
+import com.lzbi.bi.domain.dto.SomeTypeChildrenOrgSomedayMultiReportDataDTO;
-import com.lzbi.draft.domain.dto.SomeTypeChildrenOrgSomedayMultiReportDataDTO;
+import com.lzbi.bi.domain.req.ReportDataReq;
-import com.lzbi.draft.domain.req.ReportDataReq;
+import com.lzbi.bi.domain.vo.ChildrenOrgSomedaySomeReportDataVO;
-import com.lzbi.draft.domain.vo.ChildrenOrgSomedaySomeReportDataVO;
+import com.lzbi.bi.domain.vo.SomeOrgSomeReportYearlyDataVO;
-import com.lzbi.draft.domain.vo.SomeOrgSomeReportYearlyDataVO;
+import com.lzbi.bi.domain.vo.SomeOrgSomedaySomeReportDataVO;
-import com.lzbi.draft.domain.vo.SomeOrgSomedaySomeReportDataVO;
 
 import java.util.List;
 

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.bi.domain.dto.SomeOrgSomedayMultiReportDataDTO;
-import com.lzbi.draft.domain.dto.SomeTypeChildrenOrgSomedayMultiReportDataDTO;
+import com.lzbi.bi.domain.dto.SomeTypeChildrenOrgSomedayMultiReportDataDTO;
-import com.lzbi.draft.domain.req.ReportDataReq;
+import com.lzbi.bi.domain.req.ReportDataReq;
-import com.lzbi.draft.domain.vo.ChildrenOrgSomedaySomeReportDataVO;
+import com.lzbi.bi.domain.vo.ChildrenOrgSomedaySomeReportDataVO;
-import com.lzbi.draft.domain.vo.SomeOrgSomeReportYearlyDataVO;
+import com.lzbi.bi.domain.vo.SomeOrgSomeReportYearlyDataVO;
-import com.lzbi.draft.domain.vo.SomeOrgSomedaySomeReportDataVO;
+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<MapOrgVO> selectMapOrgList(ReportDataReq reportDataReq) {
+        List<MapOrgVO> 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;
+    }
 }

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.bi.domain.dto.SomeOrgSomedayMultiReportDataDTO;
-import com.lzbi.draft.domain.dto.SomeTypeChildrenOrgSomedayMultiReportDataDTO;
+import com.lzbi.bi.domain.dto.SomeTypeChildrenOrgSomedayMultiReportDataDTO;
-import com.lzbi.draft.domain.req.ReportDataReq;
+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<DcBusiDataScreenMai
         return result;
     }
 
+    public List<MapOrgVO> selectMapOrgList(ReportDataReq reportDataReq) {
+        return baseMapper.selectMapOrgList(reportDataReq);
+    }
+
     /**
      * 查询某组织某天多图表数据DTO列表
      * @param reportDataReq

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;

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;
 

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;
 

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;

lzbi-module/src/main/resources/mapper/DcBusiDataScreenMainMapper.xml

@@ -315,8 +315,8 @@
     </select>
     
     <select id="selectSomeOrgSomedaySomeReportData"
-            parameterType="com.lzbi.draft.domain.req.ReportDataReq"
+            parameterType="com.lzbi.bi.domain.req.ReportDataReq"
-            resultType="com.lzbi.draft.domain.vo.SomeOrgSomedaySomeReportDataVO">
+            resultType="com.lzbi.bi.domain.vo.SomeOrgSomedaySomeReportDataVO">
         SELECT
             t1.value_result,
             t1.value_plan
@@ -336,8 +336,8 @@
     </select>
 
     <select id="selectChildrenOrgSomedaySomeReportDataList"
-            parameterType="com.lzbi.draft.domain.req.ReportDataReq"
+            parameterType="com.lzbi.bi.domain.req.ReportDataReq"
-            resultType="com.lzbi.draft.domain.vo.ChildrenOrgSomedaySomeReportDataVO">
+            resultType="com.lzbi.bi.domain.vo.ChildrenOrgSomedaySomeReportDataVO">
         SELECT
             t5.dept_id as "orgId",
             t5.dept_name as "orgName",
@@ -360,8 +360,8 @@
     </select>
 
     <select id="selectSomeOrgSomedayMultiReportDataList"
-            parameterType="com.lzbi.draft.domain.req.ReportDataReq"
+            parameterType="com.lzbi.bi.domain.req.ReportDataReq"
-            resultType="com.lzbi.draft.domain.dto.SomeOrgSomedayMultiReportDataDTO">
+            resultType="com.lzbi.bi.domain.dto.SomeOrgSomedayMultiReportDataDTO">
         SELECT
             t3.report_name,
             t1.value_result,
@@ -387,8 +387,8 @@
     </select>
 
     <select id="selectSomeTypeChildrenOrgSomedayMultiReportDataList"
-            parameterType="com.lzbi.draft.domain.req.ReportDataReq"
+            parameterType="com.lzbi.bi.domain.req.ReportDataReq"
-            resultType="com.lzbi.draft.domain.dto.SomeTypeChildrenOrgSomedayMultiReportDataDTO">
+            resultType="com.lzbi.bi.domain.dto.SomeTypeChildrenOrgSomedayMultiReportDataDTO">
         SELECT
             t4.org_id,
             t5.dept_name AS "orgName",
@@ -419,8 +419,8 @@
     </select>
 
     <select id="selectSomeOrgSomeReportYearlyDataList"
-            parameterType="com.lzbi.draft.domain.req.ReportDataReq"
+            parameterType="com.lzbi.bi.domain.req.ReportDataReq"
-            resultType="com.lzbi.draft.domain.vo.SomeOrgSomeReportYearlyDataVO">
+            resultType="com.lzbi.bi.domain.vo.SomeOrgSomeReportYearlyDataVO">
         SELECT
             t3.report_name,
             t1.date_year,

lzbi-module/src/main/resources/mapper/asset/DcBusiTargetDraftDaynewMapper.xml

@@ -221,7 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
-    <select id="selectTargetDraftDaynewList" parameterType="com.lzbi.draft.domain.req.ReportDataReq" resultType="com.lzbi.draft.domain.vo.TargetDraftDaynewResVo">
+    <select id="selectTargetDraftDaynewList" parameterType="com.lzbi.bi.domain.req.ReportDataReq" resultType="com.lzbi.draft.domain.vo.TargetDraftDaynewResVo">
         select
             d.organize_name, d.organize_id, c.report_name, d.value_result, m.target_unit
         from
@@ -273,7 +273,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="selectTargetDraftDaynewRangeList" parameterType="com.lzbi.draft.domain.req.ReportDataReq" resultType="com.lzbi.draft.domain.vo.TargetDraftDayRangeResVo">
+    <select id="selectTargetDraftDaynewRangeList" parameterType="com.lzbi.bi.domain.req.ReportDataReq" resultType="com.lzbi.draft.domain.vo.TargetDraftDayRangeResVo">
         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>
 
-    <select id="selectTargetDraftDaynewAggregateList" parameterType="com.lzbi.draft.domain.req.ReportDataReq" resultType="com.lzbi.draft.domain.vo.TargetDraftDaynewAggregateResVo">
+    <select id="selectTargetDraftDaynewAggregateList" parameterType="com.lzbi.bi.domain.req.ReportDataReq" resultType="com.lzbi.draft.domain.vo.TargetDraftDaynewAggregateResVo">
         select
             d.organize_name,
             d.organize_id,

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>
 
-    <select id="selectDcBusiTargetDraftMontAggregateList" parameterType="com.lzbi.draft.domain.req.ReportDataReq" resultType="com.lzbi.draft.domain.vo.TargetDraftMonthAggregateResVo">
+    <select id="selectDcBusiTargetDraftMontAggregateList" parameterType="com.lzbi.bi.domain.req.ReportDataReq" resultType="com.lzbi.draft.domain.vo.TargetDraftMonthAggregateResVo">
         select
             d.org_name,
             d.org_id,