elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

dev
yinzuomei 3 years ago
parent
3f1fb0792b b994adfb02
commit
2d0c9323a0
11 changed files with 44 additions and 30 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. 4
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerStaffRedis.java
  2. 2
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
  3. 4
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
  4. 4
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
  5. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
  6. 41
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
  7. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
  8. 4
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
  9. 3
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
  10. 6
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java
  11. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

4
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerStaffRedis.java
View File

@ -65,6 +65,10 @@ public class CustomerStaffRedis {
* @remark 此方法仅用于 获取某个工作人员的信息，不用于获取客户下所有工作人员信息
*/
public static CustomerStaffInfoCacheResult getStaffInfo(String customerId, String staffId) {
if (StringUtils.isBlank(customerId) || StringUtils.isBlank(staffId)){
log.warn("getStaffInfo param is blank,customerId:{},staffId:{}",customerId,staffId);
return null;
}
String key = RedisKeys.getCustomerStaffInfoKey(customerId, staffId);
Map<String, Object> roleMap = customerStaffRedis.redisUtils.hGetAll(key);
if (!CollectionUtils.isEmpty(roleMap)) {

2
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
View File

@ -524,7 +524,7 @@ public interface GovOrgOpenFeignClient {
* @date 2021/11/3 3:30 下午
*/
@PostMapping("/gov/org/ichouse/selecthouseinfobyidcard")
Result<List<String>> selectHouseInfoByIdCard(@RequestParam("idCard")String idCard);
Result<List<String>> selectHouseInfoByIdCard(@RequestParam("idCard")String idCard,@RequestParam("customerId")String customerId);
@GetMapping("/gov/org/ichouse/{id}")
Result<IcHouseDTO> get(@PathVariable("id") String id);

4
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
View File

@ -311,8 +311,8 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
}
@Override
public Result<List<String>> selectHouseInfoByIdCard(String idCard) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectHouseInfoByIdCard", idCard);
public Result<List<String>> selectHouseInfoByIdCard(String idCard,String customerId) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectHouseInfoByIdCard", idCard, customerId);
}
@Override

4
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
View File

@ -98,8 +98,8 @@ public class IcHouseController {
* @date 2021/11/3 3:30 下午
*/
@PostMapping("selecthouseinfobyidcard")
public Result<List<String>> selectHouseInfoByIdCard(@RequestParam("idCard")String idCard){
return new Result<List<String>>().ok(icHouseService.selectHouseInfoByIdCard(idCard));
public Result<List<String>> selectHouseInfoByIdCard(@RequestParam("idCard")String idCard,@RequestParam("customerId")String customerId){
return new Result<List<String>>().ok(icHouseService.selectHouseInfoByIdCard(idCard,customerId));
}
/**

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
View File

@ -52,7 +52,7 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
* @author zxc
* @date 2021/11/3 3:30 下午
*/
List<String> selectHouseInfoByIdCard(@Param("idCard") String idCard);
List<String> selectHouseInfoByIdCard(@Param("idCard") String idCard,@Param("customerId")String customerId);
Integer checkDoorNameUq(@Param("neighborHoodId") String neighborHoodId,
@Param("buildingId")String buildingId,

41
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
View File

@ -163,7 +163,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
if (StringUtils.isNotBlank(dto.getHouseType()) ){
if( !"楼房".equals(dto.getHouseType()) && !dto.getHouseType().equals("平房") && !dto.getHouseType().equals("别墅") ){
nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.HOUSE_ERROR);
disposeErrorMsg(info,"房屋类型的值未填写或者所填写信息在系统中未找到");
return;
}
}
@ -177,13 +177,13 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
!dto.getPurpose().equals("商住混用") &&
!dto.getPurpose().equals("其他")) ){
nums.add(num);
disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
disposeErrorMsg(info, "房屋用途的值未填写或者所填写信息在系统中未找到");
return;
}
dto.setPurpose(HousePurposeEnums.getKeyByValue(dto.getPurpose()));
if (StringUtils.isNotBlank(dto.getRentFlagString()) && (!dto.getRentFlagString().equals("是") && !dto.getRentFlagString().equals("否"))){
nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.HOUSE_ERROR);
disposeErrorMsg(info,"是否出租的值未填写或者所填写信息在系统中未找到");
return;
}
dto.setRentFlag(HouseRentFlagEnums.getCodeByName(dto.getRentFlagString()));
@ -226,10 +226,13 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
for (ImportGeneralDTO r : needInsertList) {
if (k.equals(r.getBuildingUnitId()+"_"+r.getDoorName())){
// 集合里重复的
/*nums.add(r.getNum());
disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
r.setExistStatus(true);*/
if (!r.getAddStatus()){
nums.add(r.getNum());
disposeErrorMsg(info,"文件中存在重复数据");
r.setExistStatus(true);
r.setAddStatus(true);
}
/*if (!r.getAddStatus()){
for (ExistHouseInfoResultDTO existHouse : existHouses) {
if (existHouse.getName().equals(r.getBuildingUnitId()+"_"+r.getDoorName())){
r.setHouseId(existHouse.getHouseId());
@ -239,7 +242,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
needUpdateList.add(r);
r.setAddStatus(true);
r.setExistStatus(true);
}
}*/
}
}
}
@ -293,12 +296,12 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
// 排除不是本楼的
if (!dto.getBuildingName().equals(buildingGeneralDTO.getBuildingName())){
nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.HOUSE_ERROR);
disposeErrorMsg(info,"所属楼栋的值未填写或者所填写信息在系统中未找到");
}else {
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(buildingGeneralDTO.getGridId());
if (null == gridInfo){
nums.add(num);
disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
disposeErrorMsg(info, "所属网格的值未填写或者所填写信息在系统中未找到");
return;
}
// 排除 1、小区名不一样&&楼栋名一样 2、网格名不一样&&小区名一样&&楼名一样 3、组织名不一样&&网格名一样&&小区名一样&&楼名一样
@ -316,7 +319,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
if (null == agencyInfo){
nums.add(num);
disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
disposeErrorMsg(info, "所属组织的值未填写或者所填写信息在系统中未找到");
return;
}
dto.setPid(agencyInfo.getPid());
@ -349,12 +352,12 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
//排除不是本小区的
if (!dto.getNeighborHoodName().equals(neighborHoodGeneralDTO.getNeighborHoodName())){
nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.HOUSE_ERROR);
disposeErrorMsg(info,"所属小区的值未填写或者所填写信息在系统中未找到");
}else {
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(neighborHoodGeneralDTO.getGridId());
if (null == gridInfo){
nums.add(num);
disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
disposeErrorMsg(info, "所属网格的值未填写或者所填写信息在系统中未找到");
return;
}
// 1.排除网格名不一样但小区名一样 2.排除组织不一样，网格一样，小区一样
@ -370,7 +373,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
if (null == agencyInfo){
nums.add(num);
disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
disposeErrorMsg(info, "所属组织的值未填写或者所填写信息在系统中未找到");
return;
}
dto.setPid(agencyInfo.getPid());
@ -391,7 +394,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getOrgId());
if (null == gridInfo){
nums.add(num);
disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
disposeErrorMsg(info, "所属网格的值未填写或者所填写信息在系统中未找到");
return;
}
//排除不是本网格的 gridName不一样排除，gridName一样但是agencyName不一样也得排除
@ -405,7 +408,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
if (null == agencyInfo){
nums.add(num);
disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
disposeErrorMsg(info, "所属组织的值未填写或者所填写信息在系统中未找到");
return;
}
dto.setPid(agencyInfo.getPid());
@ -426,21 +429,21 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
//排除不是本组织的
if (!dto.getAgencyName().equals(agencyName)){
nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.HOUSE_ERROR);
disposeErrorMsg(info,"所属组织的值未填写或者所填写信息在系统中未找到");
}else {
// 根据组织查询出所有网格，甩出不是本组织下的网格
gridInfos = null == gridInfos ? getGridInfos(formDTO.getOrgId()) : gridInfos;
if (null == gridInfos){
// 组织下确实不存在网格
nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.HOUSE_ERROR);
disposeErrorMsg(info,"所属网格的值未填写或者所填写信息在系统中未找到");
return;
}
// 根据网格名对比，没有找到的就把行号加入到未执行成功队列中
Object cacheGridName = icHouseRedis.getTemporaryCacheGrid(formDTO.getCustomerId(), formDTO.getUserId(), dto.getGridName());
if (null == cacheGridName){
nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.HOUSE_ERROR);
disposeErrorMsg(info,"所属网格的值未填写或者所填写信息在系统中未找到");
return;
}
dto.setGridId(cacheGridName.toString());
@ -448,7 +451,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
if (null == agencyInfo){
nums.add(num);
disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
disposeErrorMsg(info, "所属组织的值未填写或者所填写信息在系统中未找到");
return;
}
dto.setPid(agencyInfo.getPid());

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

@ -96,7 +96,7 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
* @author zxc
* @date 2021/11/3 3:30 下午
*/
List<String> selectHouseInfoByIdCard(String idCard);
List<String> selectHouseInfoByIdCard(String idCard,String customerId);
/**
* @Description 楼栋下房屋列表

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

@ -137,8 +137,8 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
* @date 2021/11/3 3:30 下午
*/
@Override
public List<String> selectHouseInfoByIdCard(String idCard) {
List<String> result = baseDao.selectHouseInfoByIdCard(idCard);
public List<String> selectHouseInfoByIdCard(String idCard,String customerId) {
List<String> result = baseDao.selectHouseInfoByIdCard(idCard,customerId);
if (CollectionUtils.isEmpty(result)){
return new ArrayList<>();
}

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

@ -327,7 +327,7 @@
</select>
<!-- 查询房屋信息 -->
<select id="selectHouseInfoByIdCard" resultType="java.lang.String">
<select id="selectHouseInfoByIdCard" parameterType="map" resultType="java.lang.String">
SELECT
CONCAT(inh.NEIGHBOR_HOOD_NAME,ib.BUILDING_NAME,ibu.UNIT_NAME,ih.HOUSE_NAME)
FROM ic_house ih
@ -336,6 +336,7 @@
LEFT JOIN ic_building_unit ibu ON (ibu.ID = ih.BUILDING_UNIT_ID AND ibu.DEL_FLAG = '0')
WHERE ih.DEL_FLAG = '0'
AND ih.OWNER_ID_CARD = #{idCard}
and ih.CUSTOMER_ID = #{customerId}
</select>
<select id="checkDoorNameUq" parameterType="map" resultType="java.lang.Integer">

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

@ -47,6 +47,7 @@ import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
import com.epmet.service.ProjectSatisfactionStatisticsService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -66,6 +67,7 @@ import java.util.stream.Collectors;
* @since v1.0.0 2020-05-11
*/
@Service
@Slf4j
public class ProjectSatisfactionStatisticsServiceImpl extends BaseServiceImpl<ProjectSatisfactionStatisticsDao, ProjectSatisfactionStatisticsEntity> implements ProjectSatisfactionStatisticsService {
@Autowired
@ -145,6 +147,10 @@ public class ProjectSatisfactionStatisticsServiceImpl extends BaseServiceImpl<Pr
return new ProjectEvaluateScoreResultDTO(NumConstant.EIGHTY);
}
ProjectSatisfactionStatisticsEntity entity = baseDao.selectInfoByProjectId(formDTO.getProjectId());
if (null == entity){
log.warn("project not exist in project_satisfaction_statistics,projectId is {}",formDTO.getProjectId());
return new ProjectEvaluateScoreResultDTO(NumConstant.ZERO);
}
Integer realEvalCount = entity.getBadCount() + entity.getGoodCount() + entity.getPerfectCount();
Integer shouldEvaluateCount = entity.getShouldEvaluateCount();
if (shouldEvaluateCount == NumConstant.ZERO){

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

@ -767,7 +767,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
personData.setIcResiUserId(formDTO.getUserId());
// 房屋信息查询
Result<List<String>> listResult = govOrgOpenFeignClient.selectHouseInfoByIdCard(personData.getIdCard());
Result<List<String>> listResult = govOrgOpenFeignClient.selectHouseInfoByIdCard(personData.getIdCard(),formDTO.getCustomerId());
if (!listResult.success()){
throw new RenException("查询房屋信息失败");
}

Write Preview
Loading…
Cancel
Save