From 9ec0a61f90ac2464eebc643bfe2d93ac9ba6e569 Mon Sep 17 00:00:00 2001
From: cgf <2156125618@qq.com>
Date: 星期六, 23 八月 2025 10:59:18 +0800
Subject: [PATCH] 折扣已完成现有需求2025/08/09
---
service-job/src/main/java/com/java110/job/cmd/importCarInout/CarInout.java | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/cmd/importCarInout/CarInout.java b/service-job/src/main/java/com/java110/job/cmd/importCarInout/CarInout.java
index 1059164..352ab11 100644
--- a/service-job/src/main/java/com/java110/job/cmd/importCarInout/CarInout.java
+++ b/service-job/src/main/java/com/java110/job/cmd/importCarInout/CarInout.java
@@ -14,6 +14,7 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.community.CommunityDto;
import com.java110.intf.common.ICarInoutInnerServiceSMO;
import com.java110.intf.community.ICommunityInnerServiceSMO;
@@ -40,7 +41,7 @@
public static final String DOMAIN = "OSS";
public static final String BUCKET_NAME = "bucketName";
- public static final String ERROR_FOLDER = "瀵煎叆閿欒璁板綍/"; // 閿欒鏂囦欢瀛樺偍鐩綍
+ public static final String ERROR_FOLDER = "灏忓尯杞﹁締杩涘嚭鍦哄鍏ユ枃浠跺紓甯稿湴鍧�"; // 閿欒鏂囦欢瀛樺偍鐩綍
@Autowired
private ICommunityInnerServiceSMO communityInnerServiceSMO;
@@ -83,7 +84,7 @@
}
// 鏋勫缓灏忓尯鍦∣SS涓殑鏂囦欢澶硅矾寰�
- String communityFolder = "灏忓尯杞﹁締杩涘嚭鍦烘槑缁�/" + communityName + "/";
+ String communityFolder = MappingCache.getValue("OSS", "灏忓尯杞﹁締杩涘嚭鍦哄鍏ユ枃浠跺湴鍧�") + communityName + "/";
// 妫�鏌ヨ灏忓尯鏂囦欢澶规槸鍚﹀瓨鍦�
if (!doesFolderExist(ossClient, bucketName, communityFolder)) {
@@ -115,12 +116,8 @@
// 灏嗚В鏋愭垚鍔熺殑鏁版嵁瀛樺叆鏁版嵁搴擄紝浣跨敤浣犵殑Service瀹炵幇
if (result.getSuccessRecords() != null && !result.getSuccessRecords().isEmpty()) {
- int min = 100000000;
- int max = 999999999;
- Random RANDOM = new Random();
for (CarInoutPo carInoutPo : result.getSuccessRecords()) {
-// carInoutPo.setInoutId("937510345");
- carInoutPo.setInoutId((min + RANDOM.nextInt(max - min + 1))+"");
+ carInoutPo.setInoutId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_inoutId));
carInoutPo.setCommunityId(community.getCommunityId());
}
int[] counts = carInoutInnerServiceSMOImpl.batchSaveCarInout(result.getSuccessRecords());
@@ -180,7 +177,7 @@
// 鍒涘缓閿欒鏂囦欢鍚嶏紝鍦ㄥ師鏂囦欢鍚嶅墠鍔�"閿欒_"
String errorFileName = "閿欒_" + originalFileName;
// 閿欒鏂囦欢瀛樺偍璺緞
- String errorFileKey = ERROR_FOLDER + communityName + "/" + errorFileName;
+ String errorFileKey = MappingCache.getValue(DOMAIN, ERROR_FOLDER) + communityName + "/" + errorFileName;
// 鐢熸垚閿欒Excel鏂囦欢
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -400,18 +397,16 @@
* 鑾峰彇鏈�杩�11澶╃殑鏃ユ湡瀛楃涓诧紙鏍煎紡锛歽yyy-MM-dd锛�
*/
private List<String> getRecent11Days() {
- List<String> dates = new ArrayList<>();
+ List<String> date = new ArrayList<>();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
- for (int i = 0; i < 11; i++) {
- dates.add(sdf.format(calendar.getTime()));
- calendar.add(Calendar.DAY_OF_YEAR, -1); // 鍓嶄竴澶�
- }
+ // 鑾峰彇褰撳墠鏃ユ湡鐨勫墠涓�澶�
+ calendar.add(Calendar.DAY_OF_YEAR, -1);
+ date.add(sdf.format(calendar.getTime()));
- return dates;
+ return date;
}
-
/**
* 璁板綍瑙ｆ瀽缁撴灉鐨勫唴閮ㄧ被
*/
--
Gitblit v1.8.0