From c5cb75e69127ce6a2020be78e0a10f284e2091ca Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 02 一月 2020 23:56:42 +0800
Subject: [PATCH] 合并最新功能版本
---
Api/src/main/java/com/java110/api/listener/applicationKey/SaveApplicationKeyListener.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/Api/src/main/java/com/java110/api/listener/applicationKey/SaveApplicationKeyListener.java b/Api/src/main/java/com/java110/api/listener/applicationKey/SaveApplicationKeyListener.java
index 73fb19c..e7376db 100644
--- a/Api/src/main/java/com/java110/api/listener/applicationKey/SaveApplicationKeyListener.java
+++ b/Api/src/main/java/com/java110/api/listener/applicationKey/SaveApplicationKeyListener.java
@@ -17,13 +17,17 @@
import com.java110.core.annotation.Java110Listener;
+import com.java110.utils.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
+import java.util.Calendar;
+import java.util.Date;
import java.util.List;
+import java.util.Random;
/**
* 淇濆瓨灏忓尯渚﹀惉
@@ -54,6 +58,7 @@
Assert.hasKeyAndValue(reqJson, "locationTypeCd", "蹇呭～锛屼綅缃笉鑳戒负绌�");
Assert.hasKeyAndValue(reqJson, "locationObjId", "蹇呭～锛屾湭閫夋嫨浣嶇疆瀵硅薄");
Assert.hasKeyAndValue(reqJson, "storeId", "蹇呭～锛岃濉啓鍟嗘埛ID");
+ Assert.hasKeyAndValue(reqJson, "typeFlag", "蹇呭～锛岃閫夋嫨閽ュ寵绫诲瀷");
}
@@ -165,12 +170,32 @@
businessApplicationKey.put("machineId", machineDtos.get(0).getMachineId());
businessApplicationKey.put("applicationKeyId", "-1");
businessApplicationKey.put("state", "10002");
+ businessApplicationKey.put("pwd",this.getRandom());
+ if("1100103".equals(paramInJson.getString("typeFlag"))){ // 涓存椂璁块棶瀵嗙爜,鍙缃垚24灏忔椂
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.HOUR, 24);
+ businessApplicationKey.put("endTime", DateUtil.getFormatTimeString(calendar.getTime(),DateUtil.DATE_FORMATE_STRING_A));
+ }
//璁＄畻 搴旀敹閲戦
business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessApplicationKey", businessApplicationKey);
return business;
}
/**
+ * 鑾峰彇闅忔満鏁�
+ *
+ * @return
+ */
+ private String getRandom() {
+ Random random = new Random();
+ String result = "";
+ for (int i = 0; i < 6; i++) {
+ result += random.nextInt(10);
+ }
+ return result;
+ }
+
+ /**
* `msg_type` varchar(12) not null comment '娑堟伅绫诲瀷 10001 鍏憡锛�10002 閽ュ寵瀹℃牳锛�10003 灏忓尯鍏ラ┗瀹℃牳锛�10004 灏忓尯娣诲姞瀹℃牳',
* `title` varchar(30) NOT NULL COMMENT '娑堟伅鏍囬',
* `url` varchar(100) NOT NULL COMMENT '娑堟伅璺緞',
--
Gitblit v1.8.0