Merge remote-tracking branch 'origin/dev_export_excel' into develop

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java

@@ -14,11 +14,13 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.BeanUtils;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -80,4 +82,44 @@ public class ExcelUtils {
 
         exportExcel(response, fileName, targetList, targetClass);
     }
+
+    public static void exportExcelToTargetDisposeAll(HttpServletResponse response, String fileName, Collection<?> sourceList,
+                                           Class<?> targetClass) throws Exception {
+        if (!CollectionUtils.isEmpty(sourceList)){
+            List<Object> targetList = new ArrayList<>(sourceList.size());
+            for(Object source : sourceList){
+                Object target = targetClass.newInstance();
+                BeanUtils.copyProperties(source, target);
+                targetList.add(target);
+            }
+            exportExcelDispose(response, fileName, targetList, targetClass);
+        }else {
+            exportExcelDispose(response, fileName, new ArrayList<>(), targetClass);
+        }
+
+
+    }
+
+    public static void exportExcelDispose(HttpServletResponse response, String fileName, Collection<?> list,
+                                   Class<?> pojoClass) throws IOException {
+        if(StringUtils.isBlank(fileName)){
+            //当前日期
+            fileName = DateUtils.format(new Date());
+        }
+        ExportParams params = new ExportParams(fileName, "sheet的Name");
+        Workbook workbook = ExcelExportUtil.exportExcel(params, pojoClass, list);
+        Sheet sheet1 = workbook.getSheetAt(0);
+        sheet1.setDefaultColumnWidth(50*256);
+        sheet1.setDefaultRowHeight((short)(2*256));
+        response.setCharacterEncoding("UTF-8");
+        response.setHeader("content-Type", "application/vnd.ms-excel");
+        fileName = fileName + ".xls";
+        response.setHeader("Content-Disposition",
+                "attachment;filename=" +fileName);
+        ServletOutputStream out = response.getOutputStream();
+        workbook.write(out);
+        out.flush();
+        out.close();
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/CustomerDataManageFormDTO.java

@@ -0,0 +1,59 @@
+package com.epmet.dataaggre.dto.datastats.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/9/10 11:04 上午
+ * @DESC
+ */
+@Data
+public class CustomerDataManageFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 6462094914874831738L;
+
+    public interface CustomerDataManageForm{}
+
+    /**
+     * 客户ID
+     */
+    @NotBlank(message = "客户ID不能为空",groups = CustomerDataManageForm.class)
+    private String customerId;
+
+    /**
+     * 组织ID
+     */
+    @NotBlank(message = "组织ID不能为空",groups = CustomerDataManageForm.class)
+    private String agencyId;
+
+    /**
+     * 区间:Interval  截止:end
+     */
+    @NotBlank(message = "type不能为空",groups = CustomerDataManageForm.class)
+    private String type;
+
+    /**
+     * 开始时间【yyyymmdd】
+     */
+    private String startTime;
+
+    /**
+     * 结束时间【yyyymmdd】
+     */
+    @NotBlank(message = "结束时间不能为空",groups = CustomerDataManageForm.class)
+    private String endTime;
+
+    private Integer pageNo = 1;
+
+    private Integer pageSize = 20;
+
+    /**
+     * 是否分页【true分  false不分】
+     */
+    @NotNull(message = "是否分页不能为空",groups = CustomerDataManageForm.class)
+    private Boolean isPage;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java

@@ -0,0 +1,39 @@
+package com.epmet.dataaggre.dto.datastats.result;
+
+import lombok.Data;
+
+/**
+ * @Description 运营情况数据导出-接口返参
+ * @Auth sun
+ */
+@Data
+public class CustomerDataManageResultDTO {
+
+    //组织
+    private String orgName;
+    //用户数
+    private Integer userCount;
+    //居民数
+    private Integer residentCount;
+    //党员数
+    private Integer partyMemberCount;
+    //小组数
+    private Integer groupCount;
+    //话题数
+    private Integer topicCount;
+    //议题数
+    private Integer issueCount;
+    //项目数
+    private Integer projectCount;
+    //结案项目数
+    private Integer closedProjectCount;
+    //巡查人数
+    private Integer patrolPeopleCount;
+    //巡查次数
+    private Integer patrolCount;
+    //巡查时长
+    private String patrolDuration;
+
+    private Integer patrolDurationInteger;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/ScreenAgencyOrGridListDTO.java

@@ -0,0 +1,31 @@
+package com.epmet.dataaggre.dto.evaluationindex;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author sun
+ * @Description 根据组织Id判断查询直属下级组织/网格列表，组织存在子客户的查询包含子客户组织数据
+ */
+@Data
+public class ScreenAgencyOrGridListDTO implements Serializable {
+    private static final long serialVersionUID = 6328123559936824470L;
+    //组织级别（社区级：community，乡（镇、街道）级:street,区县级: district,市级: city,省级:province）
+    private String level;
+    //直属下级组织或网格集合
+    private List<AgencyGrid> agencyGridList;
+
+    @Data
+    public class AgencyGrid {
+        //组织id
+        private String agencyId;
+        //组织名称
+        private String agencyName;
+        //网格Id
+        private String gridId;
+        //网格name
+        private String gridName;
+    }
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java

@@ -1,18 +1,21 @@
 package com.epmet.dataaggre.controller;
 
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.datastats.form.*;
 import com.epmet.dataaggre.dto.datastats.result.*;
+import com.epmet.dataaggre.excel.CustomerDataManageExcel;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Author sun
@@ -215,4 +218,28 @@ public class DataStatsController {
         return new Result<GovrnRatioResultDTO>().ok(dataStatsService.governRatio(formDTO));
     }
 
+    /**
+     * @Description 客户数据管理导出
+     * @Param formDTO
+     * @Param response
+     * @author zxc
+     * @date 2021/9/10 3:52 下午
+     */
+    @PostMapping("operateexport")
+    public void CustomerDataManage(@RequestBody CustomerDataManageFormDTO formDTO, HttpServletResponse response) throws Exception {
+        ValidatorUtils.validateEntity(formDTO, CustomerDataManageFormDTO.CustomerDataManageForm.class);
+        dataStatsService.CustomerDataManage(formDTO,response);
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 运营情况数据查询
+     * @author sun
+     */
+    @PostMapping("operateexport")
+    public Result<List<CustomerDataManageResultDTO>> operateexport(@RequestBody CustomerDataManageFormDTO formDTO) throws ParseException {
+        ValidatorUtils.validateEntity(formDTO, CustomerDataManageFormDTO.CustomerDataManageForm.class);
+        return new Result<List<CustomerDataManageResultDTO>>().ok(dataStatsService.operateExport(formDTO));
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java

@@ -95,4 +95,12 @@ public interface EvaluationIndexDao {
      */
     List<ScreenCustomerAgencyDTO> getSubAgencyListByAgency(@Param("agencyId") String agencyId, @Param("areaCode") String areaCode, @Param("list") List<String> list);
 
+    /**
+     * @Description  根据组织ID查询组织名
+     * @Param agencyId
+     * @author zxc
+     * @date 2021/9/10 3:54 下午
+     */
+    String selectAgencyNameByAgencyId(@Param("agencyId")String agencyId);
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/CustomerDataManageExcel.java

@@ -0,0 +1,55 @@
+package com.epmet.dataaggre.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/9/10 10:15 上午
+ * @DESC
+ */
+@Data
+public class CustomerDataManageExcel {
+
+    @Excel(name = "组织")
+    private String orgName;
+
+    @Excel(name = "用户数")
+    private Integer userCount;
+
+    @Excel(name = "居民数")
+    private Integer residentCount;
+
+    @Excel(name = "党员数")
+    private Integer partyMemberCount;
+
+    @Excel(name = "小组数")
+    private Integer groupCount;
+
+    @Excel(name = "话题数")
+    private Integer topicCount;
+
+    @Excel(name = "议题数")
+    private Integer issueCount;
+
+    @Excel(name = "项目数")
+    private Integer projectCount;
+
+    @Excel(name = "结案项目数")
+    private Integer closedProjectCount;
+
+    @Excel(name = "巡查人数")
+    private Integer patrolPeopleCount;
+
+    @Excel(name = "巡查次数")
+    private Integer patrolCount;
+
+    @Excel(name = "巡查时长")
+    private String patrolDuration;
+
+    /**
+     * 未转换前的巡查时长
+     */
+    private Integer patrolDurationInteger;
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java

@@ -9,6 +9,8 @@ import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
 import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
 
+import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
 import java.util.List;
 
 /**
@@ -229,4 +231,20 @@ public interface DataStatsService {
      * @author sun
      */
     List<GridMemberPatrolListResultDTO> getGirdMemberPatrol(GridMemberPatrolListFormDTO formDTO);
+
+    /**
+     * @Description 客户数据管理导出
+     * @Param formDTO
+     * @Param response
+     * @author zxc
+     * @date 2021/9/10 3:52 下午
+     */
+    void CustomerDataManage(CustomerDataManageFormDTO formDTO, HttpServletResponse response) throws Exception;
+
+    /**
+     * @Description 运营情况数据查询
+     * @author sun
+     */
+    List<CustomerDataManageResultDTO> operateExport(CustomerDataManageFormDTO formDTO) throws ParseException;
+
 }

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

@@ -2,47 +2,53 @@
 
  import com.alibaba.fastjson.JSON;
  import com.epmet.commons.dynamic.datasource.annotation.DataSource;
-import com.epmet.commons.tools.constant.NumConstant;
+ import com.epmet.commons.tools.constant.NumConstant;
  import com.epmet.commons.tools.constant.StrConstant;
  import com.epmet.commons.tools.enums.OrgLevelEnum;
-import com.epmet.commons.tools.utils.DateUtils;
+ import com.epmet.commons.tools.exception.RenException;
-import com.epmet.dataaggre.constant.DataSourceConstant;
+ import com.epmet.commons.tools.utils.DateUtils;
-import com.epmet.dataaggre.constant.OrgConstant;
+ import com.epmet.commons.tools.utils.ExcelUtils;
-import com.epmet.dataaggre.dao.datastats.DataStatsDao;
+ import com.epmet.dataaggre.constant.DataSourceConstant;
-import com.epmet.dataaggre.dao.datastats.FactGridMemberStatisticsDailyDao;
+ import com.epmet.dataaggre.constant.OrgConstant;
-import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO;
+ import com.epmet.dataaggre.dao.datastats.DataStatsDao;
-import com.epmet.dataaggre.dto.datastats.form.*;
+ import com.epmet.dataaggre.dao.datastats.FactGridMemberStatisticsDailyDao;
-import com.epmet.dataaggre.dto.datastats.result.*;
+ import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO;
+ import com.epmet.dataaggre.dto.datastats.form.*;
+ import com.epmet.dataaggre.dto.datastats.result.*;
  import com.epmet.dataaggre.dto.epmetuser.form.GridMemberPatrolListFormDTO;
  import com.epmet.dataaggre.dto.epmetuser.result.GridMemberPatrolListResultDTO;
  import com.epmet.dataaggre.dto.epmetuser.result.PatrolDailySumResult;
-import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO;
+ import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO;
-import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO;
+ import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO;
-import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO;
+ import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO;
-import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
+ import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO;
-import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
+ import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
-import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
+ import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
-import com.epmet.dataaggre.entity.datastats.DimAgencyEntity;
+ import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
-import com.epmet.dataaggre.entity.datastats.FactAgencyGovernDailyEntity;
+ import com.epmet.dataaggre.entity.datastats.DimAgencyEntity;
-import com.epmet.dataaggre.service.datastats.DataStatsService;
+ import com.epmet.dataaggre.entity.datastats.FactAgencyGovernDailyEntity;
-import com.epmet.dataaggre.service.epmetuser.StatsStaffPatrolRecordDailyService;
+ import com.epmet.dataaggre.excel.CustomerDataManageExcel;
-import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService;
+ import com.epmet.dataaggre.service.datastats.DataStatsService;
-import com.epmet.dataaggre.service.opercrm.CustomerRelation;
+ import com.epmet.dataaggre.service.epmetuser.StatsStaffPatrolRecordDailyService;
-import com.github.pagehelper.PageHelper;
+ import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService;
-import lombok.extern.slf4j.Slf4j;
+ import com.epmet.dataaggre.service.opercrm.CustomerRelation;
-import org.apache.commons.collections4.CollectionUtils;
+ import com.github.pagehelper.PageHelper;
-import org.apache.commons.lang3.StringUtils;
+ import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
+ import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
+ import org.apache.commons.lang3.StringUtils;
-
+ import org.springframework.beans.factory.annotation.Autowired;
-import java.math.BigDecimal;
+ import org.springframework.stereotype.Service;
-import java.math.RoundingMode;
+
-import java.text.NumberFormat;
+ import javax.servlet.http.HttpServletResponse;
-import java.text.SimpleDateFormat;
+ import java.math.BigDecimal;
-import java.util.*;
+ import java.math.RoundingMode;
-import java.util.concurrent.atomic.AtomicInteger;
+ import java.text.NumberFormat;
-import java.util.concurrent.atomic.AtomicReference;
+ import java.text.ParseException;
-import java.util.stream.Collectors;
+ import java.text.SimpleDateFormat;
+ import java.util.*;
+ import java.util.concurrent.atomic.AtomicInteger;
+ import java.util.concurrent.atomic.AtomicReference;
+ import java.util.stream.Collectors;
 
 /**
  * @Author sun
@@ -1841,4 +1847,121 @@ public class DataStatsServiceImpl implements DataStatsService {
         return dataStatsDao.selectGirdMemberPatrol(formDTO);
     }
 
+    /**
+     * @Description 客户数据管理导出
+     * @Param formDTO
+     * @Param response
+     * @author zxc
+     * @date 2021/9/10 3:52 下午
+     */
+    @Override
+    public void CustomerDataManage(CustomerDataManageFormDTO formDTO, HttpServletResponse response) throws Exception {
+        List<CustomerDataManageResultDTO> result = operateExport(formDTO);
+        if (!CollectionUtils.isEmpty(result)){
+            CustomerDataManageResultDTO c = new CustomerDataManageResultDTO();
+            c.setOrgName("合计");
+            c.setUserCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getUserCount)));
+            c.setResidentCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getResidentCount)));
+            c.setPartyMemberCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getPartyMemberCount)));
+            c.setGroupCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getGroupCount)));
+            c.setTopicCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getTopicCount)));
+            c.setIssueCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getIssueCount)));
+            c.setProjectCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getProjectCount)));
+            c.setClosedProjectCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getClosedProjectCount)));
+            c.setPatrolPeopleCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getPatrolPeopleCount)));
+            c.setPatrolCount(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getPatrolCount)));
+            c.setPatrolDurationInteger(result.stream().collect(Collectors.summingInt(CustomerDataManageResultDTO::getPatrolDurationInteger)));
+            c.setPatrolDuration(getHm(c.getPatrolDurationInteger()));
+            result.add(c);
+        }
+        String fileName = excelName(formDTO);
+        ExcelUtils.exportExcelToTargetDisposeAll(response,fileName,result, CustomerDataManageExcel.class);
+    }
+
+    /**
+     * @Description  秒转换时分
+     * @Param seconds
+     * @author zxc
+     * @date 2021/9/13 10:03 上午
+     */
+    public String getHm(Integer seconds){
+        String result = "0分钟";
+        if (seconds >= NumConstant.SIXTY) {
+            Integer hours = seconds / 3600;
+            Integer minutes = seconds % 3600 / 60;
+            result = (hours < NumConstant.ONE ? "" : hours + "小时") + (minutes < NumConstant.ONE ? "" : minutes + "分钟");
+        }else if (seconds < NumConstant.SIXTY && seconds > NumConstant.ZERO){
+            result = "1分钟";
+        }
+        return result;
+    }
+
+    /**
+     * @Description  表头获取
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/9/13 10:02 上午
+     */
+    public String excelName(CustomerDataManageFormDTO formDTO){
+        StringBuffer s = new StringBuffer();
+        String agencyName = indexService.selectAgencyNameByAgencyId(formDTO.getAgencyId());
+        s.append(agencyName);
+        if (StringUtils.isNotBlank(formDTO.getStartTime())){
+            String startTime = formDTO.getStartTime();
+            String sYear = startTime.substring(0, 4);
+            String sMonth = startTime.substring(4, 6);
+            String sDay = startTime.substring(6, 8);
+            String endTime = formDTO.getEndTime();
+            String eYear = endTime.substring(0, 4);
+            String eMonth = endTime.substring(4, 6);
+            String eDay = endTime.substring(6, 8);
+            s.append(sYear).append("年").append(sMonth).append("月").append(sDay).append("日-")
+                    .append(eYear).append("年").append(eMonth).append("月").append(eDay).append("日区间新增值");
+        }else {
+            String endTime = formDTO.getEndTime();
+            String eYear = endTime.substring(0, 4);
+            String eMonth = endTime.substring(4, 6);
+            String eDay = endTime.substring(6, 8);
+            s.append(eYear).append("年").append(eMonth).append("月").append(eDay).append("日截止累计值");
+        }
+        return s.toString();
+    }
+
+    /**
+     * @Param formDTO
+     * @Description 运营情况数据查询
+     * @author sun
+     */
+    @Override
+    public List<CustomerDataManageResultDTO> operateExport(CustomerDataManageFormDTO formDTO) throws ParseException {
+        //1.必要参数校验及处理
+        if (!"Interval".equals(formDTO.getType()) && StringUtils.isEmpty(formDTO.getStartTime())) {
+            throw new RenException("请选择开始时间或查询累计值");
+        }
+        //入参有开始时间的则需要减去一天
+        if (StringUtils.isNotBlank(formDTO.getStartTime())) {
+            SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
+            Date date = format.parse(formDTO.getStartTime());
+            Date yesterday = DateUtils.addDateDays(date, -1);
+            formDTO.setStartTime(format.format(yesterday));
+        }
+
+        //2.查询组织现在，判断查询下级组织还是网格数据
+        ScreenAgencyOrGridListDTO agencyGrid = indexService.getSubAgencyOrGridList(formDTO.getAgencyId());
+        if (null == agencyGrid) {
+            return new ArrayList<>();
+        }
+        List<String> idList;
+        if (!"community".equals(agencyGrid.getLevel())) {
+            //组织层级用户、群组、话题、议题、项目、巡查数据查询
+            idList = agencyGrid.getAgencyGridList().stream().map(ScreenAgencyOrGridListDTO.AgencyGrid::getAgencyId).collect(Collectors.toList());
+        } else {
+            //网格层级用户、群组、话题、议题、项目、巡查数据查询
+            idList = agencyGrid.getAgencyGridList().stream().map(ScreenAgencyOrGridListDTO.AgencyGrid::getGridId).collect(Collectors.toList());
+
+        }
+        //3.封装数据并返回
+        return null;
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java

@@ -2,6 +2,7 @@ package com.epmet.dataaggre.service.evaluationindex;
 
 import com.epmet.dataaggre.dto.datastats.form.GovrnRatioFormDTO;
 import com.epmet.dataaggre.dto.datastats.result.GovrnRatioResultDTO;
+import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO;
@@ -71,4 +72,18 @@ public interface EvaluationIndexService {
      */
     List<ScreenCustomerAgencyDTO> getSubAgencyListByAgency(String agencyId);
 
+    /**
+     * @Description  根据组织ID查询组织名
+     * @Param agencyId
+     * @author zxc
+     * @date 2021/9/10 3:54 下午
+     */
+    String selectAgencyNameByAgencyId(String agencyId);
+
+    /**
+     * @Description 根据组织Id判断查询直属下级组织/网格列表，组织存在子客户的查询包含子客户组织数据
+     * @author sun
+     */
+    ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String agencyId);
+
 }

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

@@ -2,10 +2,12 @@ package com.epmet.dataaggre.service.evaluationindex.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.evaluationindex.EvaluationIndexDao;
 import com.epmet.dataaggre.dto.datastats.form.GovrnRatioFormDTO;
 import com.epmet.dataaggre.dto.datastats.result.GovrnRatioResultDTO;
+import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO;
@@ -143,4 +145,54 @@ public class EvaluationIndexServiceImpl implements EvaluationIndexService {
         }
     }
 
+    /**
+     * @Description  根据组织ID查询组织名
+     * @Param agencyId
+     * @author zxc
+     * @date 2021/9/10 3:54 下午
+     */
+    @Override
+    public String selectAgencyNameByAgencyId(String agencyId) {
+        return evaluationIndexDao.selectAgencyNameByAgencyId(agencyId);
+    }
+
+    /**
+     * @Description 根据组织Id判断查询直属下级组织/网格列表，组织存在子客户的查询包含子客户组织数据
+     * @author sun
+     */
+    @Override
+    public ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String agencyId) {
+        ScreenAgencyOrGridListDTO resultDTO = new ScreenAgencyOrGridListDTO();
+        List<ScreenAgencyOrGridListDTO.AgencyGrid> agencyGridList = new ArrayList<>();
+        //1.查询组织信息
+        ScreenCustomerAgencyDTO dto = evaluationIndexDao.getByAgencyId(agencyId);
+        if (dto == null) {
+            log.error(String.format("组织信息不存在,组织Id->%s"), agencyId);
+            return new ScreenAgencyOrGridListDTO();
+        }
+        //2.根据组织级别判断查询直属组织或网格列表
+        List<ScreenCustomerAgencyDTO> agencyList = new ArrayList<>();
+        List<ScreenCustomerGridDTO> gridList = new ArrayList<>();
+        if (!"community".equals(dto.getLevel())) {
+            //2-1.直属下级组织列表
+            //2.判断客户是否存在子客户
+            List<String> list = customerRelation.haveSubCustomer(dto.getCustomerId());
+            if (!CollectionUtils.isNotEmpty(list)) {
+                agencyList = evaluationIndexDao.getSubAgencyListByAgency(agencyId, null, null);
+            } else {
+                list.add(dto.getCustomerId());
+                agencyList = evaluationIndexDao.getSubAgencyListByAgency(null, dto.getAreaCode(), list);
+            }
+            agencyGridList = ConvertUtils.sourceToTarget(agencyList, ScreenAgencyOrGridListDTO.AgencyGrid.class);
+        } else {
+            //2-2.直属下级网格列表
+            gridList = evaluationIndexDao.getSubGridList(agencyId);
+            agencyGridList = ConvertUtils.sourceToTarget(gridList, ScreenAgencyOrGridListDTO.AgencyGrid.class);
+        }
+
+        resultDTO.setLevel(dto.getLevel());
+        resultDTO.setAgencyGridList(agencyGridList);
+        return resultDTO;
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml

@@ -175,4 +175,11 @@
         </if>
     </select>
 
+    <!-- 根据组织ID查询组织名 -->
+    <select id="selectAgencyNameByAgencyId" resultType="java.lang.String">
+        SELECT AGENCY_NAME FROM screen_customer_agency
+        WHERE AGENCY_ID = #{agencyId}
+          AND DEL_FLAG = 0
+    </select>
+
 </mapper>