From 85910e452884cb4ce3349ef6e7245bc30379497e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 14 一月 2021 22:32:48 +0800
Subject: [PATCH] 优化代码
---
service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 101 insertions(+), 3 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java
index 26d1e9e..a8247c7 100644
--- a/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java
@@ -1,6 +1,7 @@
package com.java110.fee.bmo.impl;
import com.alibaba.fastjson.JSONArray;
+import com.java110.core.factory.Java110ThreadPoolFactory;
import com.java110.core.smo.IComputeFeeSMO;
import com.java110.dto.RoomDto;
import com.java110.dto.fee.FeeConfigDto;
@@ -15,6 +16,7 @@
import com.java110.intf.fee.IFeeInnerServiceSMO;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
+import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.ListenerExecuteException;
import com.java110.utils.util.Assert;
@@ -29,7 +31,12 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@Service
public class QueryOweFeeImpl implements IQueryOweFee {
@@ -59,6 +66,14 @@
@Autowired
private IComputeFeeSMO computeFeeSMOImpl;
+ //鍩�
+ public static final String DOMAIN_COMMON = "DOMAIN.COMMON";
+
+ //閿�
+ public static final String TOTAL_FEE_PRICE = "TOTAL_FEE_PRICE";
+
+ //閿�
+ public static final String RECEIVED_AMOUNT_SWITCH = "RECEIVED_AMOUNT_SWITCH";
@Override
public ResponseEntity<String> query(FeeDto feeDto) {
@@ -74,8 +89,7 @@
}
List<FeeDto> tmpFeeDtos = new ArrayList<>();
for (FeeDto tmpFeeDto : feeDtos) {
- computeFeeSMOImpl.computeOweFee(tmpFeeDto);//璁＄畻娆犺垂閲戦
-
+ computeFeeSMOImpl.computeEveryOweFee(tmpFeeDto);//璁＄畻娆犺垂閲戦
//濡傛灉閲戦涓�0 灏辨帓闄�
if (tmpFeeDto.getFeePrice() > 0 && tmpFeeDto.getEndTime().getTime() <= DateUtil.getCurrentDate().getTime()) {
tmpFeeDtos.add(tmpFeeDto);
@@ -145,9 +159,93 @@
}
double feePrice = computeFeeSMOImpl.getFeePrice(feeDto);
feeDto.setFeePrice(feePrice);
+ //搴旀敹娆惧彇鍊�
+ String val = MappingCache.getValue(DOMAIN_COMMON, TOTAL_FEE_PRICE);
+ feeDto.setVal(val);
+ String received_amount_switch = MappingCache.getValue(DOMAIN_COMMON, RECEIVED_AMOUNT_SWITCH);
+ if (StringUtil.isEmpty(received_amount_switch)) {
+ feeDto.setReceivedAmountSwitch("1");//榛樿鍚敤瀹炴敹娆捐緭鍏ユ
+ } else {
+ feeDto.setReceivedAmountSwitch(received_amount_switch);
+ }
return ResultVo.createResponseEntity(feeDto);
}
+ @Override
+ public ResponseEntity<String> querys(FeeDto feeDto) {
+ RoomDto roomDto = new RoomDto();
+ roomDto.setCommunityId(feeDto.getCommunityId());
+ roomDto.setRoomId(feeDto.getPayerObjId());
+ List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+
+ if (roomDtos == null || roomDtos.size() < 1) {
+ return ResultVo.createResponseEntity(ResultVo.CODE_OK, "鎴愬姛", new JSONArray());
+ }
+ //鏌ヨ璐圭敤淇℃伅arrearsEndTime
+ List<RoomDto> tmpRoomDtos = new ArrayList<>();
+ List<RoomDto> tempRooms = new ArrayList<>();
+ int threadNum = Java110ThreadPoolFactory.JAVA110_DEFAULT_THREAD_NUM;
+ for (int roomIndex = 0; roomIndex < roomDtos.size(); roomIndex++) {
+ tempRooms.add(roomDtos.get(roomIndex));
+ if (roomIndex % threadNum == 0 && roomIndex != 0) {
+ tmpRoomDtos.addAll(doGetTmpRoomDto(tempRooms, feeDto, threadNum));
+ tempRooms = new ArrayList();
+ }
+ }
+ if (tempRooms.size() > 0) {
+ tmpRoomDtos.addAll(doGetTmpRoomDto(tempRooms, feeDto, tempRooms.size()));
+ }
+
+ return ResultVo.createResponseEntity(tmpRoomDtos);
+ }
+
+ private List<RoomDto> doGetTmpRoomDto(List<RoomDto> roomDtos, FeeDto feeDto, int threadNum) {
+ Java110ThreadPoolFactory java110ThreadPoolFactory = null;
+ try {
+ java110ThreadPoolFactory = Java110ThreadPoolFactory.getInstance().createThreadPool(threadNum);
+ for (RoomDto roomDto1 : roomDtos) {
+ java110ThreadPoolFactory.submit(() -> {
+ return getTmpRoomDtos(roomDto1, feeDto);
+ });
+ }
+ return java110ThreadPoolFactory.get();
+ }finally {
+ if(java110ThreadPoolFactory != null){
+ java110ThreadPoolFactory.stop();
+ }
+ }
+ }
+
+ private RoomDto getTmpRoomDtos(RoomDto tmpRoomDto, FeeDto feeDto) {
+ FeeDto tmpFeeDto = null;
+ tmpFeeDto = new FeeDto();
+ tmpFeeDto.setArrearsEndTime(DateUtil.getCurrentDate());
+ tmpFeeDto.setState(FeeDto.STATE_DOING);
+ tmpFeeDto.setPayerObjId(tmpRoomDto.getRoomId());
+ tmpFeeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
+ List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
+
+ if (feeDtos == null || feeDtos.size() < 1) {
+ return null;
+ }
+
+ List<FeeDto> tmpFeeDtos = new ArrayList<>();
+ for (FeeDto tempFeeDto : feeDtos) {
+
+ computeFeeSMOImpl.computeEveryOweFee(tempFeeDto, tmpRoomDto);//璁＄畻娆犺垂閲戦
+ //濡傛灉閲戦涓�0 灏辨帓闄�
+ if (tempFeeDto.getFeePrice() > 0 && tempFeeDto.getEndTime().getTime() <= DateUtil.getCurrentDate().getTime()) {
+ tmpFeeDtos.add(tempFeeDto);
+ }
+ }
+
+ if (tmpFeeDtos.size() < 1) {
+ return null;
+ }
+ tmpRoomDto.setFees(tmpFeeDtos);
+ return tmpRoomDto;
+ }
+
private boolean freshFeeDtoParam(FeeDto feeDto) {
if (StringUtil.isEmpty(feeDto.getPayerObjId())) {
--
Gitblit v1.8.0