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/UpdateApplicationKeyListener.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/Api/src/main/java/com/java110/api/listener/applicationKey/UpdateApplicationKeyListener.java b/Api/src/main/java/com/java110/api/listener/applicationKey/UpdateApplicationKeyListener.java
index 35404c8..1b7bf21 100644
--- a/Api/src/main/java/com/java110/api/listener/applicationKey/UpdateApplicationKeyListener.java
+++ b/Api/src/main/java/com/java110/api/listener/applicationKey/UpdateApplicationKeyListener.java
@@ -20,12 +20,15 @@
import com.java110.entity.center.AppService;
import com.java110.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
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.List;
/**
@@ -62,6 +65,7 @@
Assert.hasKeyAndValue(reqJson, "endTime", "蹇呭～锛岃閫夋嫨缁撴潫鏃堕棿");
Assert.hasKeyAndValue(reqJson, "locationTypeCd", "蹇呭～锛屼綅缃笉鑳戒负绌�");
Assert.hasKeyAndValue(reqJson, "locationObjId", "蹇呭～锛屾湭閫夋嫨浣嶇疆瀵硅薄");
+ Assert.hasKeyAndValue(reqJson, "typeFlag", "蹇呭～锛屾湭閫夋嫨閽ュ寵绫诲瀷");
}
@@ -147,6 +151,13 @@
businessApplicationKey.putAll(paramInJson);
businessApplicationKey.put("machineId", machineDtos.get(0).getMachineId());
businessApplicationKey.put("state", applicationKeyDtos.get(0).getState());
+ if(!paramInJson.containsKey("pwd") || StringUtil.isEmpty(paramInJson.getString("pwd"))) {
+ businessApplicationKey.put("pwd", applicationKeyDtos.get(0).getPwd());
+ }
+ if("1100103".equals(paramInJson.getString("typeFlag"))){ // 涓存椂璁块棶瀵嗙爜,鍙缃垚24灏忔椂
+ businessApplicationKey.put("endTime", applicationKeyDtos.get(0).getEndTime());
+ }
+ businessApplicationKey.put("typeFlag", applicationKeyDtos.get(0).getTypeCd());
//璁＄畻 搴旀敹閲戦
business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessApplicationKey", businessApplicationKey);
return business;
@@ -166,7 +177,7 @@
fileRelDto.setRelTypeCd("30000");
fileRelDto.setObjId(paramInJson.getString("applicationKeyId"));
List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
- if(fileRelDtos == null || fileRelDtos.size() == 0){
+ if (fileRelDtos == null || fileRelDtos.size() == 0) {
JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FILE_REL);
business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 2);
@@ -194,6 +205,7 @@
}
+
public IMachineInnerServiceSMO getMachineInnerServiceSMOImpl() {
return machineInnerServiceSMOImpl;
}
--
Gitblit v1.8.0