From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-job/src/main/java/com/java110/job/task/fee/GenerateOweFeeTemplate.java | 74 +++++++++++++++++++++++++++++++-----
1 files changed, 63 insertions(+), 11 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/task/fee/GenerateOweFeeTemplate.java b/service-job/src/main/java/com/java110/job/task/fee/GenerateOweFeeTemplate.java
index 0a9b0df..d0d6dc2 100644
--- a/service-job/src/main/java/com/java110/job/task/fee/GenerateOweFeeTemplate.java
+++ b/service-job/src/main/java/com/java110/job/task/fee/GenerateOweFeeTemplate.java
@@ -6,8 +6,10 @@
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
+import com.java110.dto.logSystemError.LogSystemErrorDto;
import com.java110.dto.reportOweFee.ReportOweFeeDto;
import com.java110.dto.task.TaskDto;
+import com.java110.intf.common.ILogSystemErrorInnerServiceSMO;
import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
@@ -17,13 +19,17 @@
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
import com.java110.job.quartz.TaskSystemQuartz;
+import com.java110.po.logSystemError.LogSystemErrorPo;
import com.java110.po.reportOweFee.ReportOweFeePo;
+import com.java110.service.smo.ISaveSystemErrorSMO;
import com.java110.utils.util.DateUtil;
-import com.java110.utils.util.StringUtil;
+import com.java110.utils.util.ExceptionUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* @ClassName GenerateOwnerBillTemplate
@@ -35,6 +41,8 @@
**/
@Component
public class GenerateOweFeeTemplate extends TaskSystemQuartz {
+
+ public static final double DEFAULT_ROW = 200.0;
@Autowired
@@ -64,6 +72,12 @@
@Autowired
private IComputeFeeSMO computeFeeSMOImpl;
+ @Autowired
+ private ILogSystemErrorInnerServiceSMO logSystemErrorInnerServiceSMOImpl;
+
+ @Autowired
+ private ISaveSystemErrorSMO saveSystemErrorSMOImpl;
+
@Override
protected void process(TaskDto taskDto) throws Exception {
@@ -83,6 +97,11 @@
*/
private void GenerateOweFee(TaskDto taskDto, CommunityDto communityDto) {
+
+ //鍒犻櫎鏃犵敤鏁版嵁
+
+ feeDataFiltering(communityDto.getCommunityId());
+
//鏌ヨ璐圭敤椤�
FeeConfigDto feeConfigDto = new FeeConfigDto();
feeConfigDto.setCommunityId(communityDto.getCommunityId());
@@ -93,11 +112,22 @@
try {
GenerateOweFeeByFeeConfig(taskDto, tmpFeeConfigDto);
} catch (Exception e) {
+ LogSystemErrorPo logSystemErrorPo = new LogSystemErrorPo();
+ logSystemErrorPo.setErrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_errId));
+ logSystemErrorPo.setErrType(LogSystemErrorDto.ERR_TYPE_JOB);
+ logSystemErrorPo.setMsg(ExceptionUtil.getStackTrace(e));
+ saveSystemErrorSMOImpl.saveLog(logSystemErrorPo);
logger.error("璐圭敤鍑鸿处澶辫触" + tmpFeeConfigDto.getConfigId(), e);
}
}
+ }
+
+ private void feeDataFiltering(String communityId) {
+ Map reportFeeDto = new HashMap();
+ reportFeeDto.put("communityId", communityId);
+ reportOweFeeInnerServiceSMOImpl.deleteInvalidFee(reportFeeDto);
}
/**
@@ -109,21 +139,43 @@
private void GenerateOweFeeByFeeConfig(TaskDto taskDto, FeeConfigDto feeConfigDto) throws Exception {
//褰撳墠璐圭敤椤规槸鍚�
-
FeeDto feeDto = new FeeDto();
feeDto.setConfigId(feeConfigDto.getConfigId());
feeDto.setCommunityId(feeConfigDto.getCommunityId());
- List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
- //娌℃湁鍏宠仈璐圭敤
- if (feeDto == null || feeDtos.size() < 1) {
- return;
- }
- for (FeeDto tmpFeeDto : feeDtos) {
+ //鍏堟煡璇㈡�绘暟
+ int count = feeInnerServiceSMOImpl.queryFeesCount(feeDto);
+
+ double record = Math.ceil(count / DEFAULT_ROW);
+
+ for (int page = 1; page <= record; page++) {
try {
- generateFee(tmpFeeDto, feeConfigDto);
+ feeDto.setPage(page);
+ feeDto.setRow(new Double(DEFAULT_ROW).intValue());
+ List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
+ //娌℃湁鍏宠仈璐圭敤
+ if (feeDtos == null || feeDtos.size() < 1) {
+ continue;
+ }
+ for (FeeDto tmpFeeDto : feeDtos) {
+ try {
+ generateFee(tmpFeeDto, feeConfigDto);
+ } catch (Exception e) {
+ LogSystemErrorPo logSystemErrorPo = new LogSystemErrorPo();
+ logSystemErrorPo.setErrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_errId));
+ logSystemErrorPo.setErrType(LogSystemErrorDto.ERR_TYPE_JOB);
+ logSystemErrorPo.setMsg(ExceptionUtil.getStackTrace(e));
+ saveSystemErrorSMOImpl.saveLog(logSystemErrorPo);
+ logger.error("鐢熸垚璐圭敤澶辫触", e);
+ }
+ }
} catch (Exception e) {
- logger.error("鐢熸垚璐圭敤澶辫触", e);
+ LogSystemErrorPo logSystemErrorPo = new LogSystemErrorPo();
+ logSystemErrorPo.setErrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_errId));
+ logSystemErrorPo.setErrType(LogSystemErrorDto.ERR_TYPE_JOB);
+ logSystemErrorPo.setMsg(ExceptionUtil.getStackTrace(e));
+ saveSystemErrorSMOImpl.saveLog(logSystemErrorPo);
+ logger.error("璐圭敤鍑鸿处澶辫触" + feeConfigDto.getConfigId(), e);
}
}
@@ -159,7 +211,7 @@
ReportOweFeeDto reportOweFeeDto = new ReportOweFeeDto();
reportOweFeeDto.setFeeId(feeDto.getFeeId());
reportOweFeeDto.setPayerObjId(feeDto.getPayerObjId());
- List<ReportOweFeeDto> reportOweFeeDtos = reportOweFeeInnerServiceSMOImpl.queryReportOweFees(reportOweFeeDto);
+ List<ReportOweFeeDto> reportOweFeeDtos = reportOweFeeInnerServiceSMOImpl.queryReportAllOweFees(reportOweFeeDto);
if (reportOweFeeDtos == null || reportOweFeeDtos.size() < 1) {
reportOweFeePo.setOweId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_oweId));
reportOweFeeInnerServiceSMOImpl.saveReportOweFee(reportOweFeePo);
--
Gitblit v1.8.0