Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master'

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java

@@ -1,10 +1,12 @@
 package com.epmet.dto.form.yt;
 
 import com.epmet.commons.tools.dto.form.PageFormDTO;
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 /**
@@ -14,9 +16,14 @@ import java.util.Date;
  */
 @Data
 public class CommunityLoginFormDTO extends PageFormDTO {
+    public interface StreetTotalShowGroup extends CustomerClientShowGroup {
+    }
+
+
     /**
      * 所选择的组织id
      */
+    @NotBlank(message = "请选择区县",groups = StreetTotalShowGroup.class)
     private String orgId;
 
     /**

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java

@@ -16,6 +16,7 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter;
+import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.yt.CommunityLoginFormDTO;
 import com.epmet.dto.form.yt.CountActivityFormDTO;
 import com.epmet.dto.form.yt.LoginLogCountByLevelFormDTO;
@@ -154,6 +155,21 @@ public class StaffLoginLogController {
                 formDTO.getPageNo(), formDTO.getPageSize()));
     }
 
+    /**
+     * 柱状图点击区县，查看街道，调用此接口
+     * 计算的是街道的工作人员+街道下所有社区的人  的总次数
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("streetTotal")
+    public Result<PageData<CommunityLoginResultDTO>> streetTotal(@RequestBody CommunityLoginFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO,CommunityLoginFormDTO.StreetTotalShowGroup.class);
+        return new Result<PageData<CommunityLoginResultDTO>>().ok(staffLoginLogService.streetTotal(formDTO.getOrgId(),
+                formDTO.getStartDate(),
+                formDTO.getEndDate(),
+                formDTO.getPageNo(), formDTO.getPageSize()));
+    }
+
     /***
      * 获取当前agencyid下 下级组织活跃情况
      * @param formDTO

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java

@@ -81,4 +81,6 @@ public interface StaffLoginLogDao extends BaseDao<StaffLoginLogEntity> {
     Integer selectLoginTotalByPath(@Param("orgIdPath") String orgIdPath,
                                    @Param("startDate") Date startDate,
                                    @Param("endDate") Date endDate);
+
+    List<CommunityLoginResultDTO> selectStreetTotal(@Param("orgId") String orgId, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffLoginLogService.java

@@ -84,6 +84,12 @@ public interface StaffLoginLogService extends BaseService<StaffLoginLogEntity> {
      */
     PageData<CommunityLoginResultDTO> streetCount(String orgId, Date startDate, Date endDate, Boolean isPage, Integer pageNo, Integer pageSize);
 
+    /**
+     * 柱状图点击区县，查看街道，调用此接口
+     * 计算的是街道的工作人员+街道下所有社区的人  的总次数
+     * @return
+     */
+    PageData<CommunityLoginResultDTO> streetTotal(String orgId, Date startDate, Date endDate, Integer pageNo, Integer pageSize);
     /***
      * 获取登陆情况
      * @param formDTO

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java

@@ -261,13 +261,14 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl<StaffLoginLogDao,
         agencyWrapper.eq(CustomerAgencyEntity::getPid,orgId).orderByAsc(CustomerAgencyEntity::getCreatedTime);
         List<CustomerAgencyEntity> subAgencyList=customerAgencyDao.selectList(agencyWrapper);
         List<CommunityLoginResultDTO> list=new ArrayList<>();
+        //横坐标展示所有组织
         for(CustomerAgencyEntity agencyEntity:subAgencyList){
             CommunityLoginResultDTO resultDTO=new CommunityLoginResultDTO();
             resultDTO.setAgencyId(agencyEntity.getId());
             resultDTO.setAgencyName(agencyEntity.getOrganizationName());
             resultDTO.setAgencyLevel(agencyEntity.getLevel());
             String orgIdPath=PidUtils.convertPid2OrgIdPath(agencyEntity.getId(),agencyEntity.getPids());
-            //查询本组织及下级
+            //查询本组织及下级登录次数！！！！！！！！
             resultDTO.setCount(baseDao.selectLoginTotalByPath(orgIdPath,startDate,endDate));
             list.add(resultDTO);
         }
@@ -335,4 +336,20 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl<StaffLoginLogDao,
         int total = CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size();
         return new PageData<>(list, total, total);
     }
+
+    /**
+     * 柱状图点击区县，查看街道，调用此接口
+     * 计算的是街道的工作人员+街道下所有社区的人  的总次数
+     * @return
+     */
+    @Override
+    public PageData<CommunityLoginResultDTO> streetTotal(String orgId, Date startDate, Date endDate,Integer pageNo, Integer pageSize){
+        PageHelper.startPage(pageNo, pageSize);
+        // todo
+        List<CommunityLoginResultDTO> list = baseDao.selectStreetTotal(orgId, startDate, endDate);
+        PageInfo<CommunityLoginResultDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal(), pageSize);
+    }
+
+
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml

@@ -233,4 +233,32 @@
             and l.LOGIN_TIME <= #{endDate}
         </if>
     </select>
+
+    <select id="selectStreetTotal" parameterType="map" resultType="com.epmet.dto.result.yt.CommunityLoginResultDTO">
+        SELECT
+            ca.id AS agencyId,
+            ca.ORGANIZATION_NAME AS agencyName,
+            ca.LEVEL AS agencyLevel,
+            pa.ORGANIZATION_NAME as districtName,
+            count(l.id) AS count
+        FROM customer_agency ca
+        left join staff_login_log l
+            ON (
+                (ca.ID =l.AGENCY_ID  or ca.id=l.pid)
+                and l.del_flag='0'
+                )
+        left join customer_agency pa
+            on(ca.pid=pa.id)
+        WHERE
+            ca.DEL_FLAG = '0'
+            and ca.pid=#{orgId}
+            <if test='null != startDate'>
+                and l.LOGIN_TIME &gt;= #{startDate}
+            </if>
+            <if test='null != endDate'>
+                and l.LOGIN_TIME &lt;= #{endDate}
+            </if>
+        GROUP BY  ca.id
+        order by count(l.id) desc
+    </select>
 </mapper>

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java

@@ -21,8 +21,9 @@ public class ResiPortrayalDetailDTO {
     @ExcelIgnore
     private String gridId;
 
-    @ExcelProperty(value = "所属网格")
+    @ExcelIgnore
-    @ColumnWidth(30)
+    // @ExcelProperty(value = "所属网格")
+    // @ColumnWidth(30)
     private String gridName;
 
     /**
@@ -53,8 +54,9 @@ public class ResiPortrayalDetailDTO {
     @ExcelIgnore
     private String homeId;
 
-    @ExcelProperty(value = "所属房屋")
+    @ExcelIgnore
-    @ColumnWidth(30)
+    // @ExcelProperty(value = "所属房屋")
+    // @ColumnWidth(30)
     private String homeName;
 
     /**

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalResult.java

@@ -0,0 +1,17 @@
+package com.epmet.dto.result.resi;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2023/4/19 17:26
+ */
+@Data
+public class ResiPortrayalResult {
+    private Integer total;
+    private List<ResiPortrayalResultDTO> list;
+}
+

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -64,7 +64,7 @@ import com.epmet.dto.result.*;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO;
 import com.epmet.dto.result.resi.ResiPortrayalDetailDTO;
-import com.epmet.dto.result.resi.ResiPortrayalResultDTO;
+import com.epmet.dto.result.resi.ResiPortrayalResult;
 import com.epmet.enums.IcResiUserTableEnum;
 import com.epmet.excel.PartyMemberAgeExportExcel;
 import com.epmet.excel.PartyMemberEducationExportExcel;
@@ -1538,8 +1538,8 @@ public class IcResiUserController implements ResultDataResolver {
      * @return
      */
     @PostMapping("age-distribute")
-    public Result<List<ResiPortrayalResultDTO>> queryAgeDistribute(@LoginUser TokenDto tokenDto,@RequestBody ResiPortrayalCommonFormDTO formDTO) {
+    public Result<ResiPortrayalResult> queryAgeDistribute(@LoginUser TokenDto tokenDto, @RequestBody ResiPortrayalCommonFormDTO formDTO) {
-        return new Result<List<ResiPortrayalResultDTO>>().ok(icResiUserService.queryAgeDistribute(tokenDto.getCustomerId(),tokenDto.getUserId(),formDTO.getOrgId(), formDTO.getOrgType()));
+        return new Result<ResiPortrayalResult>().ok(icResiUserService.queryAgeDistribute(tokenDto.getCustomerId(),tokenDto.getUserId(),formDTO.getOrgId(), formDTO.getOrgType()));
     }
 
     /**
@@ -1551,8 +1551,8 @@ public class IcResiUserController implements ResultDataResolver {
      * @return
      */
     @PostMapping("education-distribute")
-    public Result<List<ResiPortrayalResultDTO>> queryEducationDistribute(@LoginUser TokenDto tokenDto,@RequestBody ResiPortrayalCommonFormDTO formDTO) {
+    public Result<ResiPortrayalResult> queryEducationDistribute(@LoginUser TokenDto tokenDto,@RequestBody ResiPortrayalCommonFormDTO formDTO) {
-        return new Result<List<ResiPortrayalResultDTO>>().ok(icResiUserService.queryEducationDistribute(tokenDto.getCustomerId(),tokenDto.getUserId(),formDTO.getOrgId(), formDTO.getOrgType()));
+        return new Result<ResiPortrayalResult>().ok(icResiUserService.queryEducationDistribute(tokenDto.getCustomerId(),tokenDto.getUserId(),formDTO.getOrgId(), formDTO.getOrgType()));
     }
 
     /**
@@ -1595,7 +1595,7 @@ public class IcResiUserController implements ResultDataResolver {
             List<ResiPortrayalDetailDTO> list = null;
             do {
                 // 默认查询本组织及下级
-                data = icResiUserService.queryPortrayalResiList(EpmetRequestHolder.getLoginUserCustomerId(),EpmetRequestHolder.getLoginUserId(),
+                data = icResiUserService.queryPortrayalResiListForExport(EpmetRequestHolder.getLoginUserCustomerId(),EpmetRequestHolder.getLoginUserId(),
                         formDTO.getPageNo(),formDTO.getPageSize(),
                         formDTO.getOrgId(),formDTO.getOrgType(),
                         formDTO.getCodeType(),formDTO.getCode());

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

@@ -29,7 +29,7 @@ import com.epmet.dto.result.*;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO;
 import com.epmet.dto.result.resi.ResiPortrayalDetailDTO;
-import com.epmet.dto.result.resi.ResiPortrayalResultDTO;
+import com.epmet.dto.result.resi.ResiPortrayalResult;
 import com.epmet.entity.IcResiUserEntity;
 import com.epmet.excel.support.ExportResiUserItemDTO;
 import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO;
@@ -562,7 +562,7 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      * @param orgType
      * @return
      */
-    List<ResiPortrayalResultDTO> queryAgeDistribute(String customerId, String staffId, String orgId, String orgType);
+    ResiPortrayalResult queryAgeDistribute(String customerId, String staffId, String orgId, String orgType);
 
     /**
      * 烟台需求：https://modao.cc/app/DUshpXWirii6amoDQsb8OP#screen=slfbvoz5w4z9f98
@@ -573,7 +573,7 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      * @param orgType agency/grid
      * @return
      */
-    List<ResiPortrayalResultDTO> queryEducationDistribute(String customerId, String staffId, String orgId, String orgType);
+    ResiPortrayalResult queryEducationDistribute(String customerId, String staffId, String orgId, String orgType);
 
     /**
      * 烟台需求：https://modao.cc/app/DUshpXWirii6amoDQsb8OP#screen=slfbvoz5w4z9f98
@@ -585,4 +585,21 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
                                                             Integer pageNo, Integer pageSize,
                                                             String orgId, String orgType,
                                                             String codeType,String code);
+
+    /**
+     * 导出居民画像，居民列表调用此方法。只导出列表信息
+     * @param customerId
+     * @param staffId
+     * @param pageNo
+     * @param pageSize
+     * @param orgId
+     * @param orgType
+     * @param codeType
+     * @param code
+     * @return
+     */
+    PageData<ResiPortrayalDetailDTO> queryPortrayalResiListForExport(String customerId, String staffId,
+                                                            Integer pageNo, Integer pageSize,
+                                                            String orgId, String orgType,
+                                                            String codeType,String code);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -63,6 +63,7 @@ import com.epmet.dto.result.demand.IcResiDemandDictDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO;
 import com.epmet.dto.result.resi.ResiPortrayalDetailDTO;
+import com.epmet.dto.result.resi.ResiPortrayalResult;
 import com.epmet.dto.result.resi.ResiPortrayalResultDTO;
 import com.epmet.entity.*;
 import com.epmet.enums.RenHuConditionEnum;
@@ -3914,7 +3915,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
      * @return
      */
     @Override
-    public List<ResiPortrayalResultDTO> queryAgeDistribute(String customerId,String staffId,String orgId, String orgType) {
+    public ResiPortrayalResult queryAgeDistribute(String customerId, String staffId, String orgId, String orgType) {
+        ResiPortrayalResult result=new ResiPortrayalResult();
         if (StringUtils.isBlank(orgId)) {
             orgId = CustomerStaffRedis.getStaffInfo(customerId, staffId).getAgencyId();
             orgType = OrgTypeEnum.AGENCY.getCode();
@@ -3926,15 +3928,21 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         List<ResiPortrayalResultDTO> resultList=getDefaultAgeDistribute();
         List<ResiPortrayalResultDTO> list=baseDao.selectAgeAgeDistribute(customerId,orgId,orgType,orgIdPath);
         if(CollectionUtils.isEmpty(list)){
-            return resultList;
+            result.setTotal(NumConstant.ZERO);
+            result.setList(resultList);
+            return result;
         }
         Map<String,Integer> resultMap = list.stream().collect(Collectors.toMap(ResiPortrayalResultDTO::getCode,ResiPortrayalResultDTO::getTotalResi));
-        resultList.forEach(result->{
+        int total=NumConstant.ZERO;
-            if (MapUtils.isNotEmpty(resultMap) && resultMap.containsKey(result.getCode())) {
+        for(ResiPortrayalResultDTO resultDto:resultList){
-                result.setTotalResi(resultMap.get(result.getCode()));
+            if (MapUtils.isNotEmpty(resultMap) && resultMap.containsKey(resultDto.getCode())) {
+                resultDto.setTotalResi(resultMap.get(resultDto.getCode()));
             }
-        });
+            total+=resultDto.getTotalResi();
-        return resultList;
+        }
+        result.setTotal(total);
+        result.setList(resultList);
+        return result;
     }
 
     private List<ResiPortrayalResultDTO> getDefaultAgeDistribute() {
@@ -3978,7 +3986,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
      * @return
      */
     @Override
-    public List<ResiPortrayalResultDTO> queryEducationDistribute(String customerId, String staffId, String orgId, String orgType) {
+    public ResiPortrayalResult queryEducationDistribute(String customerId, String staffId, String orgId, String orgType) {
+        ResiPortrayalResult result=new ResiPortrayalResult();
         if (StringUtils.isBlank(orgId)) {
             orgId = CustomerStaffRedis.getStaffInfo(customerId, staffId).getAgencyId();
             orgType = OrgTypeEnum.AGENCY.getCode();
@@ -3998,17 +4007,21 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         List<ResiPortrayalResultDTO> totalList = baseDao.queryEducationDistribute(customerId, orgId, orgType,orgIdPath);
         Map<String,Integer> map = totalList.stream().collect(Collectors.toMap(ResiPortrayalResultDTO::getCode,ResiPortrayalResultDTO::getTotalResi));
         List<ResiPortrayalResultDTO> resultDTOList = new ArrayList<>();
-        dictResult.getData().forEach(dict -> {
+        int total=NumConstant.ZERO;
+        for (DictListResultDTO dict : dictResult.getData()) {
             ResiPortrayalResultDTO resultDTO = new ResiPortrayalResultDTO();
             resultDTO.setCode(dict.getValue());
             resultDTO.setCodeName(dict.getLabel());
             resultDTO.setTotalResi(NumConstant.ZERO);
-            if(MapUtils.isNotEmpty(map)&&map.containsKey(dict.getValue())){
+            if (MapUtils.isNotEmpty(map) && map.containsKey(dict.getValue())) {
                 resultDTO.setTotalResi(map.get(dict.getValue()));
             }
             resultDTOList.add(resultDTO);
-        });
+            total += resultDTO.getTotalResi();
-        return resultDTOList;
+        }
+        result.setTotal(total);
+        result.setList(resultDTOList);
+        return result;
     }
 
 
@@ -4086,5 +4099,38 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         return new PageData<>(list, pageInfo.getTotal(), pageSize);
     }
 
+    @Override
+    public PageData<ResiPortrayalDetailDTO> queryPortrayalResiListForExport(String customerId, String staffId,
+                                                                   Integer pageNo, Integer pageSize,
+                                                                   String orgId, String orgType,
+                                                                   String codeType,
+                                                                   String code) {
+        // 获取文化程度字典
+        DictListFormDTO dictFormDTO = new DictListFormDTO();
+        dictFormDTO.setDictType(DictTypeEnum.EDUCATION.getCode());
+        Result<List<DictListResultDTO>> dictResult = epmetAdminOpenFeignClient.dictList(dictFormDTO);
+        if (!dictResult.success() || CollectionUtils.isEmpty(dictResult.getData())) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "学历字典获取失败", "学历字典获取失败");
+        }
+        Map<String, String> educationMap = dictResult.getData().stream().collect(Collectors.toMap(DictListResultDTO::getValue, DictListResultDTO::getLabel));
 
+        if (StringUtils.isBlank(orgId)) {
+            orgId = CustomerStaffRedis.getStaffInfo(customerId, staffId).getAgencyId();
+            orgType = OrgTypeEnum.AGENCY.getCode();
+        }
+        String orgIdPath=StrConstant.EPMETY_STR;
+        if(OrgTypeEnum.AGENCY.getCode().equals(orgType)){
+            orgIdPath=CustomerOrgRedis.getOrgIdPath(orgId,orgType);
+        }
+        PageHelper.startPage(pageNo, pageSize);
+        List<ResiPortrayalDetailDTO> list = baseDao.selectPortrayalResiList(customerId, orgId, orgType,orgIdPath,codeType, code);
+        if(CollectionUtils.isNotEmpty(list)){
+            list.forEach(resi -> {
+                // 学历名称
+                resi.setEducationName(educationMap.get(resi.getEducationCode()));
+            });
+        }
+        PageInfo<ResiPortrayalDetailDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal(), pageSize);
+    }
 }