layixia

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/DataListLeftSubTotalFormDTO.java

@@ -17,11 +17,13 @@ public class DataListLeftSubTotalFormDTO {
     @NotBlank(message = "orgType不能为空",groups = AddUserInterGroup.class)
     private String orgType;
 
-    @NotBlank(message = "coverageType不能为空",groups = AddUserInterGroup.class)
+
     private String coverageType;
+
     @NotBlank(message = "categoryKey不能为空",groups = AddUserInterGroup.class)
     private String categoryKey;
 
+    @NotBlank(message = "placeType不能为空",groups = AddUserInterGroup.class)
     private String placeType;
 
 

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/DataListLeftSubTotalResDTO.java

@@ -1,10 +1,19 @@
 package com.epmet.dataaggre.dto.govorg.result;
 
+import lombok.Data;
+
 /**
  * @Description
  * @Author yzm
  * @Date 2022/7/29 10:45
  */
+@Data
 public class DataListLeftSubTotalResDTO {
+    private String orgId;
+    private String orgType;
+    private String orgName;
+    private String longitude;
+    private String latitude;
+    private Integer total=0;
 }
 

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/GridInfoResultDTO.java

@@ -38,5 +38,13 @@ public class GridInfoResultDTO implements Serializable {
     private String gridId = "";
     private String gridName = "";
     private String pids = "";
+    /**
+     * 中心位置经度
+     */
+    private String longitude;
 
+    /**
+     * 中心位置纬度
+     */
+    private String latitude;
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/result/OrgInfoCommonDTO.java

@@ -17,4 +17,13 @@ public class OrgInfoCommonDTO implements Serializable {
     private String orgId;
     private String orgName;
     private String orgType;
+    /**
+     * 中心位置经度
+     */
+    private String longitude;
+
+    /**
+     * 中心位置纬度
+     */
+    private String latitude;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -246,6 +246,8 @@ public class GovOrgServiceImpl implements GovOrgService {
                 agecnyInfo.setOrgId(agencyEntity.getId());
                 agecnyInfo.setOrgName(agencyEntity.getOrganizationName());
                 agecnyInfo.setOrgType("agency");
+                agecnyInfo.setLatitude(agencyEntity.getLatitude());
+                agecnyInfo.setLongitude(agencyEntity.getLongitude());
                 result.add(agecnyInfo);
             });
             return result;
@@ -257,6 +259,8 @@ public class GovOrgServiceImpl implements GovOrgService {
                 gridInfo.setOrgId(grid.getGridId());
                 gridInfo.setOrgName(grid.getGridName());
                 gridInfo.setOrgType("grid");
+                gridInfo.setLongitude(grid.getLongitude());
+                gridInfo.setLatitude(grid.getLatitude());
                 result.add(gridInfo);
             });
         }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java

@@ -17,6 +17,7 @@ import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.redis.common.bean.HouseInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.EpmetRequestHolder;
+import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.dataaggre.constant.OrgConstant;
 import com.epmet.dataaggre.constant.TableConstant;
 import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult;
@@ -27,6 +28,7 @@ import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO;
 import com.epmet.dataaggre.dto.govorg.form.DataListLeftSubTotalFormDTO;
 import com.epmet.dataaggre.dto.govorg.form.SearchDetailFormDTO;
 import com.epmet.dataaggre.dto.govorg.result.*;
+import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO;
 import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity;
 import com.epmet.dataaggre.entity.govorg.*;
 import com.epmet.dataaggre.entity.govproject.IcEventEntity;
@@ -1046,7 +1048,17 @@ public class CoverageServiceImpl implements CoverageService {
      */
     @Override
     public List<DataListLeftSubTotalResDTO> dataListLeftSubTotal(DataListLeftSubTotalFormDTO formDTO) {
-        // todo
-        return null;
+        List<DataListLeftSubTotalResDTO> resultList=new ArrayList<>();
+        List<OrgInfoCommonDTO> list = SpringContextUtils.getBean(GovOrgService.class).queryNextOrgInfoDTO(formDTO.getCoverageType(), formDTO.getOrgId());
+        if(CollectionUtils.isNotEmpty(list)){
+            resultList=ConvertUtils.sourceToTarget(list,DataListLeftSubTotalResDTO.class);
+            for(DataListLeftSubTotalResDTO orgRes:resultList){
+
+
+
+
+            }
+        }
+        return resultList;
     }
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml

@@ -47,7 +47,9 @@
     <select id="selectGridListByAgencyId" resultType="com.epmet.dataaggre.dto.govorg.result.GridInfoResultDTO">
         SELECT
             id AS "gridId",
-            grid_name AS "gridName"
+            grid_name AS "gridName",
+            LATITUDE as latitude,
+            LONGITUDE as longitude,
         FROM
             customer_grid
         WHERE