|
|
@ -1,12 +1,14 @@ |
|
|
|
package com.epmet.module.user.service.impl; |
|
|
|
package com.epmet.service.user.impl; |
|
|
|
|
|
|
|
import com.epmet.commons.tools.exception.RenException; |
|
|
|
import com.epmet.commons.tools.security.user.LoginUserUtil; |
|
|
|
import com.epmet.commons.tools.utils.Result; |
|
|
|
import com.epmet.constant.DataReportModuleConstant; |
|
|
|
import com.epmet.dao.user.UserAnalysisDao; |
|
|
|
import com.epmet.dto.form.LoginUserDetailsFormDTO; |
|
|
|
import com.epmet.dto.result.LoginUserDetailsResultDTO; |
|
|
|
import com.epmet.feign.EpmetUserOpenFeignClient; |
|
|
|
import com.epmet.module.user.service.UserService; |
|
|
|
import com.epmet.service.user.UserAnalysisService; |
|
|
|
import com.epmet.user.form.UserIncrTrendFormDTO; |
|
|
|
import com.epmet.user.form.UserSubAgencyFormDTO; |
|
|
|
import com.epmet.user.form.UserSubGridFormDTO; |
|
|
@ -28,12 +30,14 @@ import org.springframework.stereotype.Service; |
|
|
|
* @date 2020/6/22 13:23 |
|
|
|
*/ |
|
|
|
@Service |
|
|
|
public class UserServiceImpl implements UserService { |
|
|
|
private static final Logger logger = LoggerFactory.getLogger(UserServiceImpl.class); |
|
|
|
public class UserAnalysisServiceImpl implements UserAnalysisService { |
|
|
|
private static final Logger logger = LoggerFactory.getLogger(UserAnalysisServiceImpl.class); |
|
|
|
@Autowired |
|
|
|
private LoginUserUtil loginUserUtil; |
|
|
|
@Autowired |
|
|
|
private EpmetUserOpenFeignClient epmetUserOpenFeignClient; |
|
|
|
@Autowired |
|
|
|
private UserAnalysisDao userAnalysisDao; |
|
|
|
|
|
|
|
/** |
|
|
|
* @return java.lang.String |
|
|
@ -49,11 +53,11 @@ public class UserServiceImpl implements UserService { |
|
|
|
loginUserDetailsFormDTO.setUserId(loginUserUtil.getLoginUserId()); |
|
|
|
Result<LoginUserDetailsResultDTO> result=epmetUserOpenFeignClient.getLoginUserDetails(loginUserDetailsFormDTO); |
|
|
|
if(!result.success()){ |
|
|
|
throw new RenException("查询用户所属组织信息失败"); |
|
|
|
throw new RenException(DataReportModuleConstant.QUERY_USER_AGENCY_FAILED); |
|
|
|
} |
|
|
|
if(result.success()){ |
|
|
|
if (null == result.getData() || StringUtils.isBlank(result.getData().getAgencyId())) { |
|
|
|
throw new RenException("查询用户所属组织信息失败"); |
|
|
|
throw new RenException(DataReportModuleConstant.QUERY_USER_AGENCY_FAILED); |
|
|
|
} |
|
|
|
} |
|
|
|
return result.getData().getAgencyId(); |
|
|
@ -67,9 +71,19 @@ public class UserServiceImpl implements UserService { |
|
|
|
**/ |
|
|
|
@Override |
|
|
|
public UserSummaryInfoResultDTO summaryInfo(UserSummaryInfoFormDTO formDTO) { |
|
|
|
UserSummaryInfoResultDTO userSummaryInfoResultDTO=new UserSummaryInfoResultDTO(); |
|
|
|
String myAgencyId=this.getMyAgency(); |
|
|
|
//TODO
|
|
|
|
return null; |
|
|
|
if(DataReportModuleConstant.PARTI_FLAG.equals(formDTO.getRegOrPartiFlag())){ |
|
|
|
userSummaryInfoResultDTO=userAnalysisDao.selectRegUserSummaryInfo(myAgencyId); |
|
|
|
}else{ |
|
|
|
userSummaryInfoResultDTO=userAnalysisDao.selectParticipationUserSummaryInfo(myAgencyId); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(userSummaryInfoResultDTO.getCurrentDate())&&userSummaryInfoResultDTO.getCurrentDate().length()==8){ |
|
|
|
userSummaryInfoResultDTO.setCurrentDate(String.valueOf(new StringBuffer(userSummaryInfoResultDTO.getCurrentDate()).insert(4,".").insert(7,"."))); |
|
|
|
} |
|
|
|
userSummaryInfoResultDTO.setPartymemberProportion(userSummaryInfoResultDTO.getPartymemberProportionValue().stripTrailingZeros().toPlainString()); |
|
|
|
userSummaryInfoResultDTO.setWarmHeartedProportion(userSummaryInfoResultDTO.getWarmHeartedProportionValue().stripTrailingZeros().toPlainString()); |
|
|
|
return userSummaryInfoResultDTO; |
|
|
|
} |
|
|
|
|
|
|
|
/** |