luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/lingshan_master' into dev 

# Conflicts:
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java
master
yinzuomei 2 years ago
parent
538526a928 8888215fd8
commit
50e66a20bd
38 changed files with 589 additions and 255 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/LingShanLianHuResiUserFormDTO.java
  2. 16
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserResultDTO.java
  3. 33
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/LingShanLianHuResiUserResultDTO.java
  4. 13
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java
  5. 8
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcHouseDao.java
  6. 8
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
  7. 23
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
  8. 10
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
  9. 31
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
  10. 24
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcHouseDao.xml
  11. 3
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingshanPartyCenterHouseLianhuDTO.java
  12. 43
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java
  13. 14
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java
  14. 41
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
  15. 66
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java
  16. 15
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/LingshanPartyCenterHouseLianhuDao.java
  17. 10
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java
  18. 27
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java
  19. 1
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java
  20. 16
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
  21. 16
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
  22. 62
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
  23. 1
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java
  24. 36
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
  25. 3
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
  26. 15
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/LingshanPartyCenterHouseLianhuDao.xml
  27. 26
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java
  28. 98
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
  29. 6
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java
  30. 4
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java
  31. 14
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
  32. 30
      epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
  33. 6
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonDataFormDTO.java
  34. 8
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java
  35. 25
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java
  36. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
  37. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
  38. 73
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

15
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/LingShanLianHuResiUserFormDTO.java
View File

@ -0,0 +1,15 @@
package com.epmet.dataaggre.dto.epmetuser.form;
import com.epmet.commons.tools.dto.form.PageFormDTO;
import lombok.Data;
/**
* @Description
* @Author yzm
* @Date 2023/5/19 9:23
*/
@Data
public class LingShanLianHuResiUserFormDTO extends PageFormDTO {
private String partyCenterHouseId;
}

16
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserResultDTO.java
View File

@ -0,0 +1,16 @@
package com.epmet.dataaggre.dto.epmetuser.result;
import lombok.Data;
/**
* @Description
* @Author yzm
* @Date 2023/5/19 9:52
*/
@Data
public class IcResiUserResultDTO {
private String icResiUserId;
private String name;
private String mobile;
}

33
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/LingShanLianHuResiUserResultDTO.java
View File

@ -0,0 +1,33 @@
package com.epmet.dataaggre.dto.epmetuser.result;
import lombok.Data;
import java.util.List;
/**
* @Description 灵山大屏-党员中共新户联户群众列表
* @Author yzm
* @Date 2023/5/19 9:10
*/
@Data
public class LingShanLianHuResiUserResultDTO {
/**
* 与入参一致
* 党员中心户房屋id,
*/
private String partyCenterHouseId;
// 关联的房屋信息
private String neighborHoodId;
private String neighborHoodName;
private String buildingId;
private String buildingName;
private String buildingUnitId;
private String unitName;
private String doorName;
private String houseId;
// 每个房屋里住的居民
private List<IcResiUserResultDTO> resiList;
}

13
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java
View File

@ -24,6 +24,8 @@ 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.dataaggre.beans.GridMemberDataAnalysisExcelExportBean;
import com.epmet.dataaggre.dto.epmetuser.form.LingShanLianHuResiUserFormDTO;
import com.epmet.dataaggre.dto.epmetuser.result.LingShanLianHuResiUserResultDTO;
import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO;
import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO;
import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
@ -567,4 +569,15 @@ public class GovOrgController {
}
}
/**
* 灵山大屏：根据房屋id，查询联户里的居民信息列表
*
* @param formDTO
* @return
*/
@PostMapping("lianHuResi")
public Result<PageData<LingShanLianHuResiUserResultDTO>> lianHuResi(@RequestBody LingShanLianHuResiUserFormDTO formDTO) {
return new Result<PageData<LingShanLianHuResiUserResultDTO>>().ok(govOrgService.lianHuResi(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getPartyCenterHouseId()));
}
}

8
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcHouseDao.java
View File

@ -2,6 +2,7 @@ package com.epmet.dataaggre.dao.govorg;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO;
import com.epmet.dataaggre.dto.epmetuser.result.LingShanLianHuResiUserResultDTO;
import com.epmet.dataaggre.entity.govorg.IcHouseEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -36,4 +37,11 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
@Param("houseId") String houseId,
@Param("houseRule") List<ResisByPolicyRulesFormDTO.HouseRule> houseRule,
@Param("statRule") List<ResisByPolicyRulesFormDTO.StatRule> statRule);
/**
* 灵山项目：查询房屋关联的联户房屋
* @param partyCenterHouseId
* @return
*/
List<LingShanLianHuResiUserResultDTO> selectListLianHuHouse(@Param("partyCenterHouseId") String partyCenterHouseId);
}

8
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
View File

@ -11,7 +11,6 @@ import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO;
import com.epmet.dataaggre.dto.govorg.form.OrgStaffListFormDTO;
import com.epmet.dataaggre.dto.govorg.form.OrgStatisticsFormDTO;
import com.epmet.dataaggre.dto.govorg.form.StaffDetailV2FormDTO;
import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO;
import com.epmet.dataaggre.dto.govorg.result.GridDateIdResultDTO;
import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO;
import com.epmet.dataaggre.dto.govorg.result.MemberProjectInfoResultDTO;
@ -269,4 +268,11 @@ public interface EpmetUserService {
Integer pageNo, Integer pageSize);
Integer staffQtyInGridsOfRole(String roleKeyAgent, Set<String> staffIds);
/**
* 根据房屋id,查询居民信息
* @param houseId
* @return
*/
List<IcResiUserResultDTO> listIcResiUserByHouseId(String houseId);
}

23
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
View File

@ -1195,4 +1195,27 @@ public class EpmetUserServiceImpl implements EpmetUserService, ResultDataResolve
return customerStaffDao.countStaffQtyByStaffIdsAndRole(staffIds, role.getId());
}
/**
* 根据房屋id,查询居民信息
*
* @param houseId
* @return
*/
@Override
public List<IcResiUserResultDTO> listIcResiUserByHouseId(String houseId) {
LambdaQueryWrapper<IcResiUserEntity> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(IcResiUserEntity::getHomeId, houseId)
.eq(IcResiUserEntity::getStatus,NumConstant.ZERO_STR);
List<IcResiUserEntity> list = icResiUserDao.selectList(queryWrapper);
List<IcResiUserResultDTO> resultList = new ArrayList<>();
for (IcResiUserEntity entity : list) {
IcResiUserResultDTO resultDTO = new IcResiUserResultDTO();
resultDTO.setIcResiUserId(entity.getId());
resultDTO.setName(entity.getName());
resultDTO.setMobile(entity.getMobile());
resultList.add(resultDTO);
}
return resultList;
}
}

10
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
View File

@ -5,6 +5,7 @@ import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.dataaggre.beans.LingShanAgentServiceStaffAndGrid;
import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO;
import com.epmet.dataaggre.dto.epmetuser.result.LingShanLianHuResiUserResultDTO;
import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO;
import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO;
import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO;
@ -309,4 +310,13 @@ public interface GovOrgService {
Set<String> getStaffIdsInGrid(String gridId);
List<CustomerGridEntity> listBelongGridsByStaffId(String staffId);
/**
* 灵山大屏：根据房屋id，查询联户里的居民信息列表
* @param pageNo
* @param pageSize
* @param partyCenterHouseId
* @return
*/
PageData<LingShanLianHuResiUserResultDTO> lianHuResi(Integer pageNo, Integer pageSize, String partyCenterHouseId);
}

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

@ -37,10 +37,7 @@ import com.epmet.dataaggre.constant.DataSourceConstant;
import com.epmet.dataaggre.constant.OrgConstant;
import com.epmet.dataaggre.dao.govorg.*;
import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO;
import com.epmet.dataaggre.dto.epmetuser.result.CustomerStaffResultDTO;
import com.epmet.dataaggre.dto.epmetuser.result.ListStaffResultDTO;
import com.epmet.dataaggre.dto.epmetuser.result.StaffRoleListResultDTO;
import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO;
import com.epmet.dataaggre.dto.epmetuser.result.*;
import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO;
import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO;
import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO;
@ -1572,4 +1569,30 @@ public class GovOrgServiceImpl implements GovOrgService {
q2.in(CustomerGridEntity::getId, staffAndGrids.stream().map(CustomerStaffGridEntity::getGridId).collect(Collectors.toList()));
return customerGridDao.selectList(q2);
}
/**
* 灵山大屏：根据房屋id，查询联户里的居民信息列表
*
* @param pageNo
* @param pageSize
* @param partyCenterHouseId
* @return
*/
public PageData<LingShanLianHuResiUserResultDTO> lianHuResi(Integer pageNo, Integer pageSize, String partyCenterHouseId) {
// 先查询关联的房屋id
PageHelper.startPage(pageNo, pageSize);
List<LingShanLianHuResiUserResultDTO> houseList = houseDao.selectListLianHuHouse(partyCenterHouseId);
if (CollectionUtils.isEmpty(houseList)) {
return new PageData<>();
}
houseList.forEach(lianHuHouse -> {
List<IcResiUserResultDTO> resiList = epmetUserService.listIcResiUserByHouseId(lianHuHouse.getHouseId());
lianHuHouse.setResiList(resiList);
});
PageInfo<LingShanLianHuResiUserResultDTO> pageInfo = new PageInfo<>(houseList);
return new PageData<>(houseList, pageInfo.getTotal());
}
}

24
epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcHouseDao.xml
View File

@ -38,4 +38,28 @@
</if>
</where>
</select>
<select id="selectListLianHuHouse" parameterType="map" resultType="com.epmet.dataaggre.dto.epmetuser.result.LingShanLianHuResiUserResultDTO">
SELECT DISTINCT
l.HOUSE_ID,
l.PARTY_CENTER_HOUSE_ID,
l.NEIGHBOR_HOOD_ID,
h.NEIGHBOR_HOOD_NAME,
l.BUILDING_ID,
ib.BUILDING_NAME,
l.BUILDING_UNIT_ID,
u.UNIT_NAME,
ih.DOOR_NAME
FROM
lingshan_party_center_house_lianhu l
INNER JOIN ic_house ih ON ( l.HOUSE_ID = ih.ID )
left join ic_neighbor_hood h on(ih.NEIGHBOR_HOOD_ID=h.ID)
left join ic_building ib on(l.BUILDING_ID=ib.ID)
left join ic_building_unit u on(l.BUILDING_UNIT_ID=u.ID)
WHERE
l.DEL_FLAG = '0'
AND l.PARTY_CENTER_HOUSE_ID = #{partyCenterHouseId}
AND ih.DEL_FLAG = '0'
order by l.CREATED_TIME asc
</select>
</mapper>

3
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingshanPartyCenterHouseLianhuDTO.java
View File

@ -70,6 +70,7 @@ public class LingshanPartyCenterHouseLianhuDTO implements Serializable {
* 联户：联户房屋id
*/
private String houseId;
private String longitude;
private String latitude;
}

43
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java
View File

@ -1,43 +0,0 @@
package com.epmet.dto.result.lingshan;
import lombok.Data;
/**
* @Description
* @Author yzm
* @Date 2023/5/18 10:56
*/
@Data
public class ScreenPartyCenterHouseDistributionResDTO {
/**
* 小区id
*/
private String neighborHoodId;
private String neighborHoodName;
/**
* 所属楼栋id
*/
private String buildingId;
private String buildingName;
/**
* 所属单元id
*/
private String buildingUnitId;
private String unitName;
/**
* 房屋名字后台插入时生成
*/
private String houseName;
/**
* 房屋坐标
*/
private String longitude;
private String latitude;
/**
* 灵山项目：是否党员中心户：1是；0不是
*/
private String partyCenterHouseFlag;
}

14
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java
View File

@ -31,7 +31,9 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.constants.ImportTaskConstants;
import com.epmet.dao.IcBuildingUnitDao;
import com.epmet.dto.BuildingTreeLevelDTO;
import com.epmet.dto.IcBuildingDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.form.lingshan.ScreenPartyCenterHouseDistributionFormDTO;
import com.epmet.dto.result.BuildingResultDTO;
import com.epmet.dto.result.BuildingResultPagedDTO;
import com.epmet.dto.result.IcBuildingListResultDTO;
@ -283,5 +285,15 @@ public class BuildingController {
}
/**
* 灵山大屏：查询楼栋坐标
*
* @param tokenDto
* @param formDTO
* @return
*/
@PostMapping("building-distribution")
public Result<List<IcBuildingDTO>> buildingDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) {
return new Result<List<IcBuildingDTO>>().ok(buildingService.buildingDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId()));
}
}

41
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
View File

@ -48,10 +48,14 @@ import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.constants.ImportTaskConstants;
import com.epmet.dao.IcHouseDao;
import com.epmet.dto.IcHouseDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.form.lingshan.PartyCenterHousePageFormDTO;
import com.epmet.dto.form.lingshan.ScreenPartyCenterHouseDistributionFormDTO;
import com.epmet.dto.result.*;
import com.epmet.dto.result.lingshan.HouseDetailResultDTO;
import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO;
import com.epmet.entity.CustomerOrgParameterEntity;
import com.epmet.feign.EpmetAdminOpenFeignClient;
import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
import com.epmet.feign.EpmetMessageOpenFeignClient;
import com.epmet.feign.EpmetUserOpenFeignClient;
@ -100,9 +104,6 @@ public class HouseController implements ResultDataResolver {
@Autowired
private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient;
@Autowired
private EpmetAdminOpenFeignClient epmetAdminOpenFeignClient;
@Autowired
private IcHouseDao icHouseDao;
@Autowired
@ -708,4 +709,36 @@ public class HouseController implements ResultDataResolver {
/**
* 灵山大屏：查询房屋坐标点位
* 支持根据网格\小区\楼栋id查询
*/
@PostMapping("house-distribution")
public Result<List<IcHouseDTO>> houseDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) {
return new Result<List<IcHouseDTO>>().ok(houseService.houseDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId(), formDTO.getBuildingId()));
}
/**
* 灵山大屏：点击房屋，显示房屋详情
* @param houseId
* @return
*/
@MaskResponse(fieldNames = {"showOwnerIdCard", "showOwnerPhone"}, fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD, MaskResponse.MASK_TYPE_MOBILE})
@PostMapping("houseDetail/{houseId}")
public Result<HouseDetailResultDTO> queryHouseDetail(@PathVariable("houseId")String houseId){
return new Result<HouseDetailResultDTO>().ok(houseService.queryHouseDetail(houseId));
}
/**
* 灵山项目:根据楼栋id返回房屋列表，分页，且返回党员中心户标志, 联户群众数
*
* @param formDTO
* @return
*/
@MaskResponse(fieldNames = {"showOwnerPhone", "showOwnerIdCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD})
@PostMapping("lingshanScreen/houseList")
public Result<PageData<PartyCenterHouseResultDTO>> queryHouseListForLingShanScreen(@RequestBody PartyCenterHousePageFormDTO formDTO) {
return new Result<PageData<PartyCenterHouseResultDTO>>().ok(houseService.queryHouseListForLingShanScreen(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getBuildingId()));
}
}

66
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java
View File

@ -1,66 +0,0 @@
package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.IcBuildingDTO;
import com.epmet.dto.IcHouseDTO;
import com.epmet.dto.form.lingshan.ScreenPartyCenterHouseDistributionFormDTO;
import com.epmet.dto.result.lingshan.HouseDetailResultDTO;
import com.epmet.service.IcBuildingService;
import com.epmet.service.IcHouseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @Description 灵山大屏-查询gov-org库的接口， 可以放在这....
* @Author yzm
* @Date 2023/5/18 10:05
*/
@RestController
@RequestMapping("houseScreen")
public class LingShanScreenGovOrgController {
@Autowired
private IcHouseService icHouseService;
@Autowired
private IcBuildingService icBuildingService;
/**
* 灵山大屏：查询楼栋坐标
*
* @param tokenDto
* @param formDTO
* @return
*/
@PostMapping("building-distribution")
public Result<List<IcBuildingDTO>> buildingDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) {
return new Result<List<IcBuildingDTO>>().ok(icBuildingService.buildingDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId()));
}
/**
* 灵山大屏：查询房屋坐标点位
* 支持根据网格\小区\楼栋id查询
*/
@PostMapping("house-distribution")
public Result<List<IcHouseDTO>> houseDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) {
return new Result<List<IcHouseDTO>>().ok(icHouseService.houseDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId(), formDTO.getBuildingId()));
}
/**
* 灵山大屏：点击房屋，显示房屋详情
* @param houseId
* @return
*/
@PostMapping("houseDetail/{houseId}")
public Result<HouseDetailResultDTO> queryHouseDetail(@PathVariable("houseId")String houseId){
return new Result<HouseDetailResultDTO>().ok(icHouseService.queryHouseDetail(houseId));
}
}

15
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/LingshanPartyCenterHouseLianhuDao.java
View File

@ -1,9 +1,12 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.result.lingshan.LingshanPartyCenterHouseLianhuDTO;
import com.epmet.entity.LingshanPartyCenterHouseLianhuEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 灵山_党员中心户联户
*
@ -15,5 +18,17 @@ public interface LingshanPartyCenterHouseLianhuDao extends BaseDao<LingshanParty
int deleteByPartyCenterHouseId(String partyCenterHouseId);
/**
* 判断房屋是否被党员中心户关联。
* @param houseId
* @return
*/
LingshanPartyCenterHouseLianhuEntity selectByHouseId(String houseId);
/**
* 查询房屋的联户房屋
* @param partyCenterHouseId
* @return
*/
List<LingshanPartyCenterHouseLianhuDTO> selectLianHuHouse(String partyCenterHouseId);
}

10
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java
View File

@ -20,6 +20,7 @@ package com.epmet.service;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.BuildingTreeLevelDTO;
import com.epmet.dto.IcBuildingDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.BuildingResultDTO;
import com.epmet.dto.result.BuildingResultPagedDTO;
@ -96,4 +97,13 @@ public interface BuildingService {
*/
Result buildingImportExcel(ImportInfoFormDTO formDTO, InputStream inputStream, Result<ImportTaskCommonResultDTO> importTask) throws IOException;
/**
* 灵山大屏：查询楼栋坐标
*
* @param customerId
* @param gridId
* @param neighborHoodId
* @return
*/
List<IcBuildingDTO> buildingDistribution(String customerId, String gridId, String neighborHoodId);
}

27
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java
View File

@ -23,6 +23,8 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.IcHouseDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
import com.epmet.dto.result.lingshan.HouseDetailResultDTO;
import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO;
import com.google.common.cache.Cache;
import javax.servlet.http.HttpServletResponse;
@ -211,4 +213,29 @@ public interface HouseService {
* @return
*/
PageData<GroupRentHouseResultDTO> groupRentHouseList(GroupRentHouseFormDTO formDTO);
/**
* 灵山大屏：查询房屋坐标点位
*
* @param gridId
* @param neighborHoodId
* @param buildingId
* @return
*/
List<IcHouseDTO> houseDistribution(String customerId, String gridId, String neighborHoodId, String buildingId);
/**
* 灵山大屏：点击房屋，显示房屋详情
* @param houseId
* @return
*/
HouseDetailResultDTO queryHouseDetail(String houseId);
/**
* 灵山项目:根据楼栋id返回房屋列表，分页，且返回党员中心户标志, 联户群众数
* @param buildingId
* @return
*/
PageData<PartyCenterHouseResultDTO> queryHouseListForLingShanScreen(Integer pageNo, Integer pageSize, String buildingId);
}

1
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java
View File

@ -149,4 +149,5 @@ public interface IcBuildingService extends BaseService<IcBuildingEntity> {
* @return
*/
List<IcBuildingDTO> buildingDistribution(String customerId, String gridId, String neighborHoodId);
}

16
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
View File

@ -192,21 +192,5 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
*/
void updatePartyCenterHouse(String houseId, String partyCenterHouseFlag);
/**
* 灵山大屏：查询房屋坐标点位
*
* @param gridId
* @param neighborHoodId
* @param buildingId
* @return
*/
List<IcHouseDTO> houseDistribution(String customerId, String gridId, String neighborHoodId, String buildingId);
/**
* 灵山大屏：点击房屋，显示房屋详情
* @param houseId
* @return
*/
HouseDetailResultDTO queryHouseDetail(String houseId);
}

16
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
View File

@ -869,4 +869,20 @@ public class BuildingServiceImpl implements BuildingService {
}
/**
* 灵山大屏：查询楼栋坐标
*
* @param customerId
* @param gridId
* @param neighborHoodId
* @return
*/
@Override
public List<IcBuildingDTO> buildingDistribution(String customerId, String gridId, String neighborHoodId) {
List<IcBuildingEntity> list=icBuildingDao.selectListByMap(customerId,gridId,neighborHoodId);
return ConvertUtils.sourceToTarget(list,IcBuildingDTO.class);
}
}

62
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
View File

@ -36,6 +36,8 @@ import com.epmet.dao.*;
import com.epmet.dto.*;
import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
import com.epmet.dto.result.lingshan.HouseDetailResultDTO;
import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO;
import com.epmet.entity.*;
import com.epmet.enums.*;
import com.epmet.feign.*;
@ -132,7 +134,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
@Autowired
private DataReportOpenFeignClient dataReportOpenFeignClient;
@Autowired
private LingshanPartyCenterHouseLianhuDao partyCenterHouseLianhuDao;
/**
* 房屋管理-新增房屋
*
@ -1553,4 +1556,61 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
PageInfo<GroupRentHouseResultDTO> pageInfo = new PageInfo<>(list);
return new PageData<>(list, pageInfo.getTotal());
}
/**
* 灵山大屏：查询房屋坐标点位
*
* @param gridId
* @param neighborHoodId
* @param buildingId
* @return
*/
@Override
public List<IcHouseDTO> houseDistribution(String customerId,String gridId, String neighborHoodId, String buildingId) {
List<IcHouseEntity> list=icHouseDao.selectListByMap(customerId,gridId,neighborHoodId,buildingId);
return ConvertUtils.sourceToTarget(list,IcHouseDTO.class);
}
/**
* 灵山大屏：点击房屋，显示房屋详情
* @param houseId
* @return
*/
@Override
public HouseDetailResultDTO queryHouseDetail(String houseId) {
IcHouseDTO data = icHouseService.get(houseId);
HouseDetailResultDTO resultDTO = ConvertUtils.sourceToTarget(data, HouseDetailResultDTO.class);
if (null != resultDTO) {
LambdaQueryWrapper<LingshanPartyCenterHouseLianhuEntity> countQuery = new LambdaQueryWrapper<>();
countQuery.eq(LingshanPartyCenterHouseLianhuEntity::getPartyCenterHouseId, houseId);
resultDTO.setTotalLianHu(partyCenterHouseLianhuDao.selectCount(countQuery));
}
return resultDTO;
}
/**
* 灵山项目:根据楼栋id返回房屋列表，分页，且返回党员中心户标志, 联户群众数
*
* @param pageNo
* @param pageSize
* @param buildingId
* @return
*/
@Override
public PageData<PartyCenterHouseResultDTO> queryHouseListForLingShanScreen(Integer pageNo, Integer pageSize, String buildingId) {
PageHelper.startPage(pageNo, pageSize);
List<PartyCenterHouseResultDTO> list = icHouseDao.selectListPartyCenterHouse(null,
null,
null,
null,
buildingId,
null);
list.forEach(item -> {
item.setHouseTypeName(HouseTypeEnums.getTypeValue(item.getHouseType()));
item.setPurposeName(HousePurposeEnums.getTypeValue(item.getPurpose()));
});
PageInfo<PartyCenterHouseResultDTO> pageInfo = new PageInfo<>(list);
return new PageData<>(list, pageInfo.getTotal(), pageSize);
}
}

1
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java
View File

@ -206,4 +206,5 @@ public class IcBuildingServiceImpl extends BaseServiceImpl<IcBuildingDao, IcBuil
List<IcBuildingEntity> list=baseDao.selectListByMap(customerId,gridId,neighborHoodId);
return ConvertUtils.sourceToTarget(list,IcBuildingDTO.class);
}
}

36
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
View File

@ -668,10 +668,8 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
if(StringUtils.isBlank(partyCenterHouseId)){
return new ArrayList<>();
}
LambdaQueryWrapper<LingshanPartyCenterHouseLianhuEntity> queryWrapper=new LambdaQueryWrapper<>();
queryWrapper.eq(LingshanPartyCenterHouseLianhuEntity::getPartyCenterHouseId,partyCenterHouseId);
List<LingshanPartyCenterHouseLianhuEntity> list=partyCenterHouseLianhuDao.selectList(queryWrapper);
return ConvertUtils.sourceToTarget(list,LingshanPartyCenterHouseLianhuDTO.class);
List<LingshanPartyCenterHouseLianhuDTO> resultList=partyCenterHouseLianhuDao.selectLianHuHouse(partyCenterHouseId);
return resultList;
}
/**
@ -726,36 +724,6 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
baseDao.update(null, update);
}
/**
* 灵山大屏：查询房屋坐标点位
*
* @param gridId
* @param neighborHoodId
* @param buildingId
* @return
*/
@Override
public List<IcHouseDTO> houseDistribution(String customerId,String gridId, String neighborHoodId, String buildingId) {
List<IcHouseEntity> list=baseDao.selectListByMap(customerId,gridId,neighborHoodId,buildingId);
return ConvertUtils.sourceToTarget(list,IcHouseDTO.class);
}
/**
* 灵山大屏：点击房屋，显示房屋详情
* @param houseId
* @return
*/
@Override
public HouseDetailResultDTO queryHouseDetail(String houseId) {
IcHouseDTO data = get(houseId);
HouseDetailResultDTO resultDTO = ConvertUtils.sourceToTarget(data, HouseDetailResultDTO.class);
if (null != resultDTO) {
LambdaQueryWrapper<LingshanPartyCenterHouseLianhuEntity> countQuery = new LambdaQueryWrapper<>();
countQuery.eq(LingshanPartyCenterHouseLianhuEntity::getPartyCenterHouseId, houseId);
resultDTO.setTotalLianHu(partyCenterHouseLianhuDao.selectCount(countQuery));
}
return resultDTO;
}
}

3
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
View File

@ -969,6 +969,9 @@
ih.DEL_FLAG = '0'
AND b.DEL_FLAG = '0'
AND h.DEL_FLAG = '0'
<if test="customerId != null and customerId != ''">
and ih.customer_id=#{customerId}
</if>
<if test="partyCenterHouseFlag != null and partyCenterHouseFlag.trim() != ''">
AND ih.PARTY_CENTER_HOUSE_FLAG='1'
</if>

15
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/LingshanPartyCenterHouseLianhuDao.xml
View File

@ -34,4 +34,19 @@
where DEL_FLAG='0'
and HOUSE_ID = #{houseId}
</select>
<select id="selectLianHuHouse" parameterType="java.lang.String" resultType="com.epmet.dto.result.lingshan.LingshanPartyCenterHouseLianhuDTO">
SELECT
l.*,
h.LONGITUDE,
h.LATITUDE
FROM
lingshan_party_center_house_lianhu l
INNER JOIN ic_house h ON ( l.HOUSE_ID = h.ID )
WHERE
l.DEL_FLAG = '0'
AND l.PARTY_CENTER_HOUSE_ID = #{partyCenterHouseId}
AND h.DEL_FLAG = '0'
order by l.CREATED_TIME asc
</select>
</mapper>

26
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java
View File

@ -25,29 +25,41 @@ public class EventAnalysisResultDTO implements Serializable {
* 网格化平台数量
*/
private Integer wangGeHua;
/**
* 归档数量
* 待处理
*/
private Integer guiDang;
private Integer daiChuLi;
/**
* 红灯占比
* 待处理占比
*/
private Double daiChuLiRate;
/**
* 黄灯占比
* 处理中
*/
private Integer chuLiZhong;
/**
* 处理中占比
*/
private Double chuLiZhongRate;
/**
* 已结案数量
*/
private Integer yiJieAn;
/**
* 蓝灯占比
* 已结案占比
*/
private Double yiJieAnRate;
/**
* 归档数量
*/
private Integer guiDang;
/**
* 归档占比
*/
private Double guiDangRate;
}

98
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
View File

@ -62,6 +62,7 @@ public class IcEventController {
/**
* 事件管理-列表
*
* @param tokenDto
* @param formDTO
* @return
@ -72,6 +73,7 @@ public class IcEventController {
formDTO.setStaffId(tokenDto.getUserId());
return new Result<PageData<IcEventListResultDTO>>().ok(icEventService.list(formDTO));
}
/**
* @Author sun
* @Description 工作端小程序-事件管理-列表
@ -84,28 +86,29 @@ public class IcEventController {
return new Result<PageData<IcEventListResultDTO>>().ok(icEventService.list(formDTO));
}
@RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
public Result<IcEventDTO> get(@PathVariable("id") String id){
@RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
public Result<IcEventDTO> get(@PathVariable("id") String id) {
IcEventDTO data = icEventService.get(id);
return new Result<IcEventDTO>().ok(data);
}
/**
* 事件管理-新增
*
* @param tokenDto
* @param formDTO
* @return
*/
@NoRepeatSubmit
@PostMapping("add")
public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcEventAddEditFormDTO formDTO){
public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcEventAddEditFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO, AddGroup.class, DefaultGroup.class);
formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setUserId(tokenDto.getUserId());
formDTO.setApp(tokenDto.getApp());
formDTO.setClient(tokenDto.getClient());
if("3".equals(formDTO.getOperationType())){
ValidatorUtils.validateEntity(formDTO.getIssueInfo(),IcEventToIssueFormDTO.AddEventAndShiftIssue.class);
if ("3".equals(formDTO.getOperationType())) {
ValidatorUtils.validateEntity(formDTO.getIssueInfo(), IcEventToIssueFormDTO.AddEventAndShiftIssue.class);
}
icEventService.save(formDTO);
return new Result();
@ -113,7 +116,7 @@ public class IcEventController {
@NoRepeatSubmit
@PostMapping("update")
public Result update(@RequestBody IcEventDTO dto){
public Result update(@RequestBody IcEventDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
icEventService.update(dto);
@ -121,7 +124,7 @@ public class IcEventController {
}
@PostMapping("delete")
public Result delete(@RequestBody String[] ids){
public Result delete(@RequestBody String[] ids) {
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
icEventService.delete(ids);
@ -130,6 +133,7 @@ public class IcEventController {
/**
* 事件处理分析-处理状态比例查询
*
* @param formDTO
* @return
*/
@ -148,6 +152,7 @@ public class IcEventController {
/**
* 事件处理分析-事件列表
*
* @param input
* @return
*/
@ -169,6 +174,7 @@ public class IcEventController {
/**
* 时间处理分析-阅读增量查询
*
* @param input
* @return
*/
@ -190,6 +196,7 @@ public class IcEventController {
/**
* 研判分析查询
*
* @param eventId
* @return
*/
@ -201,6 +208,7 @@ public class IcEventController {
/**
* 组织下，分类下的事件列表
*
* @param input
* @return
*/
@ -212,16 +220,17 @@ public class IcEventController {
String orgType = input.getOrgType();
Integer pageNo = input.getPageNo();
Integer pageSize = input.getPageSize();
PageData<IcEventResultDTO> page = icEventService.getSameCategoryEvents(orgId, orgType, categroyPid, pageNo, pageSize);
PageData<IcEventResultDTO> page = icEventService.getSameCategoryEvents(orgId, orgType, categroyPid, pageNo, pageSize);
return new Result<PageData<IcEventResultDTO>>().ok(page);
}
/**
* @Author sun
* @Description 事件管理-回复
**/
@NoRepeatSubmit
@PostMapping("reply")
public Result reply(@LoginUser TokenDto tokenDto, @RequestBody IcEventReplyFormDTO formDTO){
public Result reply(@LoginUser TokenDto tokenDto, @RequestBody IcEventReplyFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class);
formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setUserId(tokenDto.getUserId());
@ -235,12 +244,12 @@ public class IcEventController {
**/
@NoRepeatSubmit
@PostMapping("icEventToProject")
public Result icEventToProject(@LoginUser TokenDto tokenDto, @RequestBody IcEventToProjectFormDTO formDTO){
public Result icEventToProject(@LoginUser TokenDto tokenDto, @RequestBody IcEventToProjectFormDTO formDTO) {
formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setUserId(tokenDto.getUserId());
formDTO.setApp(tokenDto.getApp());
formDTO.setClient(tokenDto.getClient());
ValidatorUtils.validateEntity(formDTO,IcEventToProjectFormDTO.ApprovalCategory.class,IcEventToProjectFormDTO.AddUserInternalGroup.class);
ValidatorUtils.validateEntity(formDTO, IcEventToProjectFormDTO.ApprovalCategory.class, IcEventToProjectFormDTO.AddUserInternalGroup.class);
icEventService.icEventToProject(formDTO);
return new Result();
}
@ -250,7 +259,7 @@ public class IcEventController {
* @Description 事件管理-转需求
**/
@PostMapping("icEventToDemand")
public Result icEventToDemand(@LoginUser TokenDto tokenDto, @RequestBody IcDemandFormDTO formDTO){
public Result icEventToDemand(@LoginUser TokenDto tokenDto, @RequestBody IcDemandFormDTO formDTO) {
formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setDemandUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(formDTO, IcDemandFormDTO.AddUserShowGroup.class, IcDemandFormDTO.AddUserInternalGroup.class);
@ -260,6 +269,7 @@ public class IcEventController {
/**
* 事件转议题
*
* @param tokenDto
* @param formDTO
* @return
@ -283,7 +293,7 @@ public class IcEventController {
public Result<List<IcEventCategoryAnalysisResDTO>> categoryAnalysisTotal(@LoginUser TokenDto tokenDto, @RequestBody IcEventCategoryAnalysisFormDTO formDTO) {
formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setStaffId(tokenDto.getUserId());
ValidatorUtils.validateEntity(formDTO,IcEventCategoryAnalysisFormDTO.TotalPie.class);
ValidatorUtils.validateEntity(formDTO, IcEventCategoryAnalysisFormDTO.TotalPie.class);
List<IcEventCategoryAnalysisResDTO> list = icEventService.categoryAnalysisTotal(formDTO);
return new Result<List<IcEventCategoryAnalysisResDTO>>().ok(list);
}
@ -305,7 +315,7 @@ public class IcEventController {
* @Author sun
* @Description 事件管理-详情
**/
@MaskResponse(fieldNames = { "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD })
@MaskResponse(fieldNames = {"idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD})
@PostMapping("detail")
public Result<IcEventListResultDTO> detail(@LoginUser TokenDto tokenDto, @RequestBody IcEventListFormDTO formDTO) {
formDTO.setCustomerId(tokenDto.getCustomerId());
@ -313,6 +323,7 @@ public class IcEventController {
ValidatorUtils.validateEntity(formDTO, IcEventListFormDTO.Detail.class);
return new Result<IcEventListResultDTO>().ok(icEventService.detail(formDTO));
}
/**
* @Author sun
* @Description 工作端小程序-事件管理-详情
@ -328,6 +339,7 @@ public class IcEventController {
/**
* 事件分类分析- 饼图2，直属下级 事件数量
*
* @param tokenDto
* @param formDTO
* @return
@ -353,19 +365,20 @@ public class IcEventController {
/**
* Desc: 定时任务自动评价
*
* @param formDTO
* @author zxc
* @date 2022/5/18 16:35
*/
@PostMapping("auto-evaluation")
public Result autoEvaluation(@RequestBody AutoEvaluationFormDTO formDTO){
public Result autoEvaluation(@RequestBody AutoEvaluationFormDTO formDTO) {
icEventService.autoEvaluation(formDTO);
return new Result();
}
/**
* @Author sun
* @Description 需求完成/项目结案时 修改事件数据
* @Description 需求完成/项目结案时 修改事件数据
* 议题关闭时，如果议题来源于事件，也会调用此方法
**/
@PostMapping("closeprojectordemand")
@ -376,6 +389,7 @@ public class IcEventController {
/**
* Desc: 新增【随手拍、讲】
*
* @param tokenDto
* @param formDTO
* @author zxc
@ -383,7 +397,7 @@ public class IcEventController {
*/
@NoRepeatSubmit
@PostMapping("add-event-resi")
public Result addEventFromResi(@LoginUser TokenDto tokenDto,@RequestBody AddEventFromResiFormDTO formDTO){
public Result addEventFromResi(@LoginUser TokenDto tokenDto, @RequestBody AddEventFromResiFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO, AddEventFromResiFormDTO.AddEventFromResiForm.class);
formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setUserId(tokenDto.getUserId());
@ -394,6 +408,7 @@ public class IcEventController {
/**
* 居民端小程序我上报的事件-列表+详情
* yapi: http://yapi.elinkservice.cn/project/102/interface/api/7781
*
* @param tokenDto
* @param formDTO
* @return
@ -408,6 +423,7 @@ public class IcEventController {
/**
* 居民端我上报的事件， 消息列表跳转详情
*
* @param tokenDto
* @param formDTO
* @return
@ -423,20 +439,22 @@ public class IcEventController {
/**
* 居民端小程序我上报的事件详情页面-回复列表
* http://yapi.elinkservice.cn/project/102/interface/api/7783
*
* @param formDTO
* @return
*/
@PostMapping("reply-list")
public Result<List<IcEventReplyDTO>> replyList(@LoginUser TokenDto tokenDto,@RequestBody MyReportIcEvFormDTO formDTO) {
public Result<List<IcEventReplyDTO>> replyList(@LoginUser TokenDto tokenDto, @RequestBody MyReportIcEvFormDTO formDTO) {
formDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(formDTO, MyReportIcEvFormDTO.ReplyListGroup.class);
return new Result<List<IcEventReplyDTO>>().ok(icEventReplyService.replyList(formDTO.getIcEventId(),formDTO.getUserId()));
return new Result<List<IcEventReplyDTO>>().ok(icEventReplyService.replyList(formDTO.getIcEventId(), formDTO.getUserId()));
}
/**
* 居民端小程序我上报的事件-处理中
* 点击事件进入详情页时调用此接口，消除红点
* yapi：http://yapi.elinkservice.cn/project/102/interface/api/7790
*
* @param tokenDto
* @param formDTO
* @return
@ -452,23 +470,24 @@ public class IcEventController {
/**
* 居民端我上报的事件-回复
* http://yapi.elinkservice.cn/project/102/interface/api/7789
*
* @param tokenDto
* @param formDTO
* @return
*/
@NoRepeatSubmit
@PostMapping("resi-reply")
public Result resiReply(@LoginUser TokenDto tokenDto, @RequestBody ResiReplyIcEventFormDTO formDTO){
public Result resiReply(@LoginUser TokenDto tokenDto, @RequestBody ResiReplyIcEventFormDTO formDTO) {
formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(formDTO, ResiReplyIcEventFormDTO.AddUserShowGroup.class,ResiReplyIcEventFormDTO.AddUserInternalGroup.class);
ValidatorUtils.validateEntity(formDTO, ResiReplyIcEventFormDTO.AddUserShowGroup.class, ResiReplyIcEventFormDTO.AddUserInternalGroup.class);
icEventService.resiReply(formDTO);
return new Result();
}
/**
* @Author sun
* @Description 数字平台-事件导出
* @Description 数字平台-事件导出
**/
@NoRepeatSubmit
@PostMapping("export")
@ -487,8 +506,8 @@ public class IcEventController {
List<IcEventExcel> list = null;
do {
data = icEventService.list(formDTO);
data.getList().forEach(d->{
if(!org.springframework.util.CollectionUtils.isEmpty(d.getImageList())){
data.getList().forEach(d -> {
if (!org.springframework.util.CollectionUtils.isEmpty(d.getImageList())) {
d.setImageUrl(d.getImageList().get(NumConstant.ZERO));
}
});
@ -501,7 +520,7 @@ public class IcEventController {
response.setCharacterEncoding("UTF-8");
response.setHeader("content-type", "application/json; charset=UTF-8");
PrintWriter printWriter = response.getWriter();
Result<Object> result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),e.getMsg());
Result<Object> result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), e.getMsg());
printWriter.write(JSON.toJSONString(result));
printWriter.close();
} catch (Exception e) {
@ -515,7 +534,7 @@ public class IcEventController {
/**
* @Author sun
* @Description 工作端事件红点消除
* @Description 工作端事件红点消除
**/
@PostMapping("govRedDot")
public Result govRedDot(@RequestBody IcEventListFormDTO formDTO) {
@ -526,7 +545,7 @@ public class IcEventController {
/**
* @Author sun
* @Description 标记事件为难点堵点
* @Description 标记事件为难点堵点
**/
@PostMapping("difficultpointevent")
public Result difficultPointEvent(@RequestBody IcEventListFormDTO formDTO) {
@ -537,6 +556,7 @@ public class IcEventController {
/**
* 数据分析-个人档案-上报事件列表,根据epmetUserIdList查询
* 模仿gov/project/resieventreply/pageuserreported接口重新查询新表接口
*
* @author sun
*/
@PostMapping("icevent-pageuserreported")
@ -560,23 +580,25 @@ public class IcEventController {
}
/**
* @description 获取事件数量和分类数量
* @param * @param null
* @return Result
* @throws
* @author yan Lu
* @date 2023/5/17 14:49
*/
* @param * @param null
* @return Result
* @throws
* @description 获取事件数量和分类数量
* @author yan Lu
* @date 2023/5/17 14:49
*/
@GetMapping("getEventRate")
public Result<EventRateResultDTO> getEventRate(@RequestParam("orgId") String orgId,
@RequestParam("orgType") String orgType){
return new Result<EventRateResultDTO>().ok(icEventService.getEventRate(orgId,orgType));
@RequestParam("orgType") String orgType,
@RequestParam("eventType") String eventType) {
return new Result<EventRateResultDTO>().ok(icEventService.getEventRate(orgId, orgType, eventType));
}
@GetMapping("getEventAnalysis")
public Result<EventAnalysisResultDTO> getEventAnalysis(@RequestParam("orgId") String orgId,
@RequestParam("orgType") String orgType){
return new Result<EventAnalysisResultDTO>().ok(icEventService.getEventAnalysis(orgId,orgType));
@RequestParam("orgType") String orgType,
@RequestParam("eventType") String eventType) {
return new Result<EventAnalysisResultDTO>().ok(icEventService.getEventAnalysis(orgId, orgType, eventType));
}
}

6
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java
View File

@ -148,12 +148,12 @@ public interface IcEventDao extends BaseDao<IcEventEntity> {
List<PageUserReportEventResDTO> selectUserReported(PageUserReportEventFormDTO formDTO);
EventRateResultDTO getEventRate(@Param("orgIdPath") String orgIdPath);
EventRateResultDTO getEventRate(@Param("orgIdPath") String orgIdPath, @Param("eventType") String eventType);
EventAnalysisResultDTO getEventAnalysis(@Param("orgIdPath") String orgPath);
EventAnalysisResultDTO getEventAnalysis(@Param("orgIdPath") String orgPath, @Param("eventType") String eventType);
@MapKey("code")
List<Map<String,Integer>> getAnalysis(@Param("orgIdPath") String orgPath);
List<Map<String, Integer>> getAnalysis(@Param("orgIdPath") String orgPath);
IcEventEntity selectByEventId(String icEventId);
}

4
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java
View File

@ -257,7 +257,7 @@ public interface IcEventService extends BaseService<IcEventEntity> {
*
* @return
*/
EventRateResultDTO getEventRate(String orgId, String orgType);
EventRateResultDTO getEventRate(String orgId, String orgType, String eventType);
/**
* 事件分析数据获取
@ -266,5 +266,5 @@ public interface IcEventService extends BaseService<IcEventEntity> {
* @param orgType
* @return
*/
EventAnalysisResultDTO getEventAnalysis(String orgId, String orgType);
EventAnalysisResultDTO getEventAnalysis(String orgId, String orgType, String eventType);
}

14
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
View File

@ -1924,8 +1924,8 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
}
@Override
public EventRateResultDTO getEventRate(String orgId, String orgType) {
EventRateResultDTO erDto = baseDao.getEventRate(getOrgPath(orgId, orgType));//事件总量和灯数量,占比
public EventRateResultDTO getEventRate(String orgId, String orgType,String eventType) {
EventRateResultDTO erDto = baseDao.getEventRate(getOrgPath(orgId, orgType), eventType);//事件总量和灯数量,占比
List<Map<String, Integer>> dataMap = baseDao.getAnalysis(getOrgPath(orgId, orgType));//按分类获取数量
Map<String, Integer> temp = new HashMap<>();
if (null != dataMap && dataMap.size() > 0) {
@ -1956,10 +1956,14 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
}
@Override
public EventAnalysisResultDTO getEventAnalysis(String orgId, String orgType) {
public EventAnalysisResultDTO getEventAnalysis(String orgId, String orgType, String eventType) {
String orgPath = getOrgPath(orgId, orgType);
EventRateResultDTO erDto = baseDao.getEventRate(orgPath);//事件总量和灯数量,占比
EventAnalysisResultDTO dto = baseDao.getEventAnalysis(orgPath);
EventRateResultDTO erDto = baseDao.getEventRate(orgPath, eventType);//事件总量和灯数量,占比
EventAnalysisResultDTO dto = baseDao.getEventAnalysis(orgPath, eventType);
dto.setDaiChuLi(erDto.getHongDeng());
dto.setChuLiZhong(erDto.getHuangDeng());
dto.setYiJieAn(erDto.getLanDeng());
dto.setGuiDang(erDto.getGuiDang());
dto.setDaiChuLiRate(erDto.getHongDengRate() == null ? 0 : erDto.getHongDengRate());
dto.setChuLiZhongRate(erDto.getHuangDengRate() == null ? 0 : erDto.getHuangDengRate());
dto.setYiJieAnRate(erDto.getLanDengRate() == null ? 0 : erDto.getLanDengRate());

30
epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
View File

@ -467,24 +467,36 @@
<if test="null != orgIdPath and orgIdPath != ''">
and b.GRID_PIDS like concat(#{orgIdPath},'%')
</if>
<if test="null != eventType and eventType !=''">
AND b.SOURCE_TYPE = #{eventType}
</if>
) eb,
( SELECT SUM( CASE WHEN c.OPERATION_TYPE = 0 THEN 1 ELSE 0 END ) AS huang
FROM ic_event c WHERE c.DEL_FLAG = 0 and c.STATUS = 'processing'
<if test="null != orgIdPath and orgIdPath != ''">
and c.GRID_PIDS like concat(#{orgIdPath},'%')
</if>
<if test="null != eventType and eventType !=''">
AND c.SOURCE_TYPE = #{eventType}
</if>
) ec,
( SELECT SUM( CASE WHEN d.OPERATION_TYPE = 0 THEN 1 ELSE 0 END ) as lan
FROM ic_event d WHERE d.DEL_FLAG = 0 and d.STATUS = 'closed_case'
<if test="null != orgIdPath and orgIdPath != ''">
and d.GRID_PIDS like concat(#{orgIdPath},'%')
</if>
<if test="null != eventType and eventType !=''">
AND d.SOURCE_TYPE = #{eventType}
</if>
) ed,
( SELECT SUM( CASE WHEN d.DIFFICULT_POINT = 1 and d.OPERATION_TYPE = 0 THEN 1 ELSE 0 END) as dang
( SELECT SUM( CASE WHEN d.DIFFICULT_POINT = 1 THEN 1 ELSE 0 END) as dang
FROM ic_event d WHERE d.DEL_FLAG = 0
<if test="null != orgIdPath and orgIdPath != ''">
and d.GRID_PIDS like concat(#{orgIdPath},'%')
</if>
<if test="null != eventType and eventType !=''">
AND d.SOURCE_TYPE = #{eventType}
</if>
) ee
</select>
@ -492,10 +504,13 @@
SELECT
ea.total AS jiSuJiBan,
eb.total AS zhiTongLianBan,
ec.total AS wangGeHua
ec.total AS wangGeHua,
ed.total AS guiDang
FROM
(
SELECT COUNT( e.id ) AS total FROM ic_event e
SELECT COUNT( e.id ) AS total
FROM ic_event e
WHERE e.DEL_FLAG = 0 AND e.SOURCE_TYPE = 0 AND ( e.OPERATION_TYPE = 0 OR e.OPERATION_TYPE IS NULL )
<if test="null != orgIdPath and orgIdPath != ''">
and e.GRID_PIDS like concat(#{orgIdPath},'%')
@ -514,7 +529,14 @@
<if test="null != orgIdPath and orgIdPath != ''">
and e.GRID_PIDS like concat(#{orgIdPath},'%')
</if>
) ec
) ec,
(
SELECT COUNT( e.id ) AS total FROM ic_event e
WHERE e.DEL_FLAG = 0 AND e.DIFFICULT_POINT = 1 AND ( e.OPERATION_TYPE = 0 OR e.OPERATION_TYPE IS NULL )
<if test="null != orgIdPath and orgIdPath != ''">
and e.GRID_PIDS like concat(#{orgIdPath},'%')
</if>
) ed
</select>

6
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonDataFormDTO.java
View File

@ -23,4 +23,10 @@ public class PersonDataFormDTO implements Serializable {
@NotBlank(message = "tokenDto获取customerId不能为空",groups = PersonDataForm.class)
private String customerId;
/**
* 灵山项目需求，改造此接口，添加houseId，支持查询房屋里的所有人
* /epmetuser/icresiuser/ownerrelation接口userId与houseId至少传一个值
*/
private String houseId;
}

8
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java
View File

@ -97,10 +97,14 @@ public class IcResiUserBriefDTO extends HouseUserDTO implements Serializable {
* 民族：
*/
private String mz;
/**
* 因灵山项目添加此列：
* 与户主关系：存储字典纸
* 民族姓名
*/
private String mzName;
/**
* 因灵山项目添加此列：
* 与户主关系：存储字典：/sys/dict/data/relationship
*/
private String yhzgx;

25
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java
View File

@ -15,7 +15,18 @@ import java.util.List;
public class OwnerRelationResultDTO implements Serializable {
private static final long serialVersionUID = 2876258704168954941L;
/**
* 与户主关系是本人的居民
*/
private String ownerName;
/**
* 与户主关系是本人的居民id
*/
private String ownerUserId;
/**
* 房屋里的所有人
*/
private List<UserListBean> userList;
@NoArgsConstructor
@ -24,11 +35,25 @@ public class OwnerRelationResultDTO implements Serializable {
private String userId;
private String userName;
private String isSelf;
/**
* 与户主关系key【字典表】
*/
private String yhzgx;
/**
* 与户主关系名称
*/
private String relation;
/**
* 人户情况
*/
private String rhzk;
/**
* 2022.11.17：人户状况：人户一致、人在户不在、户在人不在、暂不清楚
*/
private String renHuCondition;
}
}

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

@ -860,7 +860,7 @@ public class IcResiUserController implements ResultDataResolver {
*/
@PostMapping("ownerrelation")
public Result<OwnerRelationResultDTO> getOwnerRelation(@RequestBody PersonDataFormDTO formDTO) {
return new Result<OwnerRelationResultDTO>().ok(icResiUserService.getOwnerRelation(formDTO.getUserId()));
return new Result<OwnerRelationResultDTO>().ok(icResiUserService.getOwnerRelation(formDTO.getUserId(),formDTO.getHouseId()));
}
/**

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

@ -136,7 +136,7 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
* @Author zhaoqifeng
* @Date 2021/11/5 10:28
*/
OwnerRelationResultDTO getOwnerRelation(String userId);
OwnerRelationResultDTO getOwnerRelation(String userId,String houseId);
/**
* @Description 获取一栋楼每个房间人员分类的数量

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

@ -1596,41 +1596,65 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
* @Date 2021/11/5 10:28
*/
@Override
public OwnerRelationResultDTO getOwnerRelation(String userId) {
public OwnerRelationResultDTO getOwnerRelation(String userId,String houseId) {
if (StringUtils.isBlank(userId) && StringUtils.isBlank(houseId)) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "入参错误userId,houseId不能同时为空", "入参错误");
}
OwnerRelationResultDTO result = new OwnerRelationResultDTO();
//获取用户信息
IcResiUserEntity user = baseDao.selectById(userId);
result.setOwnerName("");
if (null != user) {
//获取用户所在家庭里所有人员信息
LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(IcResiUserEntity::getHomeId, user.getHomeId());
wrapper.eq(IcResiUserEntity::getStatus,NumConstant.ZERO_STR);
wrapper.orderByAsc(IcResiUserEntity::getYhzgx);
List<IcResiUserEntity> resiUserList = baseDao.selectList(wrapper);
if (CollectionUtils.isNotEmpty(resiUserList)) {
List<OwnerRelationResultDTO.UserListBean> userList = resiUserList.stream().map(item -> {
if(StringUtils.isBlank(houseId)){
//获取用户信息
IcResiUserEntity user = baseDao.selectById(userId);
if (null != user) {
houseId=user.getHomeId();
}
}
//获取用户所在家庭里所有人员信息
LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(IcResiUserEntity::getHomeId, houseId);
wrapper.eq(IcResiUserEntity::getStatus,NumConstant.ZERO_STR);
wrapper.orderByAsc(IcResiUserEntity::getYhzgx);
List<IcResiUserEntity> resiUserList = baseDao.selectList(wrapper);
if (CollectionUtils.isNotEmpty(resiUserList)) {
//先找到户主：正常情况下只会有一个户主，所以找到之后，终止循环
for(IcResiUserEntity resiUserEntity:resiUserList){
//如果与房主的关系是本人，则这个人就是房主
if (RelationshipEnum.SELF.getCode().equals(resiUserEntity.getYhzgx())) {
result.setOwnerName(resiUserEntity.getName());
result.setOwnerUserId(resiUserEntity.getId());
break;
}
}
List<OwnerRelationResultDTO.UserListBean> userList=new ArrayList<>();
for(IcResiUserEntity item:resiUserList){
//成员里排除户主
if(!result.getOwnerUserId().equals(item.getId())){
OwnerRelationResultDTO.UserListBean bean = new OwnerRelationResultDTO.UserListBean();
bean.setUserId(item.getId());
bean.setUserName(item.getName());
bean.setYhzgx(item.getYhzgx());
bean.setRelation(RelationshipEnum.getEnum(item.getYhzgx()).getName());
if (userId.equals(item.getId())) {
bean.setIsSelf(NumConstant.ONE_STR);
}
//如果与房主的关系是本人，则这个人就是房主
if (RelationshipEnum.SELF.getCode().equals(item.getYhzgx())) {
result.setOwnerName(item.getName());
bean.setIsSelf(NumConstant.ZERO_STR);
// 与入参里的居民id对比
if (StringUtils.isNotBlank(userId)) {
if (userId.equals(item.getId())) {
bean.setIsSelf(NumConstant.ONE_STR);
}
}
//2022.11.17 返参增加人户状况名称
bean.setRhzk(item.getRhzk());
if (StringUtils.isBlank(item.getRhzk())){
bean.setRenHuCondition(RenHuConditionEnum.ZBQC.getName());
}else {
bean.setRenHuCondition(RenHuConditionEnum.getNameByCode(item.getRhzk()));
}
return bean;
}).collect(Collectors.toList());
result.setUserList(userList);
userList.add(bean);
}
}
result.setUserList(userList);
}
return result;
}
@ -1719,6 +1743,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
r.setGzdw(resiEntity.getGzdw());
// 因灵山项目添加一下几列 start
r.setMz(resiEntity.getMz());
Result<List<OptionResultDTO>> mzRes=epmetAdminOpenFeignClient.getNationOption();
if(mzRes.success()&&CollectionUtils.isNotEmpty(mzRes.getData())){
Map<String, String> mzMap = mzRes.getData().stream().collect(Collectors.toMap(OptionResultDTO::getValue, OptionResultDTO::getLabel));
if(MapUtils.isNotEmpty(mzMap)&&mzMap.containsKey(r.getMz())){
r.setMzName(mzMap.get(r.getMz()));
}
}
r.setYhzgx(resiEntity.getYhzgx());
r.setYhzgxName(StrConstant.EPMETY_STR);
Result<List<OptionResultDTO>> yhzgxRes=epmetAdminOpenFeignClient.getRelationshipOption();

Write Preview
Loading…
Cancel
Save