From 55ae000f3de18962fd1f24f1aff2567a812139ac Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Fri, 21 Jun 2024 13:50:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=20=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E5=B9=B4=E6=9C=88=E6=97=A5=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=A1=A9=E5=AF=86=E9=92=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsowell/service/PileService.java | 25 ++++++++++++++++---
 .../pile/PileBasicInfoController.java         | 17 +++++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java
index 3de3a2a9b..13361989a 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java
@@ -13,9 +13,7 @@ import com.jsowell.common.enums.ykc.OrderStatusEnum;
 import com.jsowell.common.enums.ykc.PileStatusEnum;
 import com.jsowell.common.enums.ykc.ReturnCodeEnum;
 import com.jsowell.common.exception.BusinessException;
-import com.jsowell.common.util.DateUtils;
-import com.jsowell.common.util.SecurityUtils;
-import com.jsowell.common.util.StringUtils;
+import com.jsowell.common.util.*;
 import com.jsowell.pile.domain.*;
 import com.jsowell.pile.dto.*;
 import com.jsowell.pile.util.SnUtils;
@@ -636,4 +634,25 @@ public class PileService {
 		String orderCode = "";
 		return orderCode;
     }
+
+	/**
+	 * 生成桩密钥
+	 * @return
+	 */
+	public String generatePileSecret() {
+		// 获取 年月日 日期
+		String dateStr = DateUtils.dateTimeNow(DateUtils.YYYYMMDD);
+		// System.out.println("dateStr:" + dateStr);
+		int dateInt = Integer.parseInt(dateStr);
+		// 将年月日加上 160829
+		String data = String.valueOf(dateInt + 160829);
+		byte[] bytes = BytesUtil.str2Bcd(data);
+		// crc16加密
+		String crc = String.format("%04x", CRC16Util.calcCrc16(bytes));
+		// System.out.println(crc);
+		// 将16进制转成10进制
+		int i = Integer.parseInt(crc, 16);
+		// System.out.println(i);
+		return String.valueOf(i);
+	}
 }
diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBasicInfoController.java
index 85b7b4832..2135d188d 100644
--- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBasicInfoController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBasicInfoController.java
@@ -233,4 +233,21 @@ public class PileBasicInfoController extends BaseController {
 	}
 
 
+	/**
+	 * 根据当前日期生成桩密钥
+	 * @return
+	 */
+	@GetMapping("/getPileSecretStr")
+	public RestApiResponse<?> getPileSecretStr() {
+		RestApiResponse<?> response = null;
+		try {
+			String result = pileService.generatePileSecret();
+			response = new RestApiResponse<>(result);
+		}catch (Exception e) {
+			logger.error("生成桩密钥 error", e);
+			response = new RestApiResponse<>(e);
+		}
+		logger.info("生成桩密钥 result:{}", response);
+		return response;
+	}
 }