From 3d571a3e5ef8e6cc76214b79ea386455afb1bd9d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 27 十二月 2024 11:02:05 +0800
Subject: [PATCH] 优化代码
---
service-common/src/main/java/com/java110/common/cmd/machine/GetCarMachineQrCodeUrl.java | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/machine/GetCarMachineQrCodeUrl.java b/service-common/src/main/java/com/java110/common/cmd/machine/GetCarMachineQrCodeUrl.java
index cfb3efb..9e61feb 100644
--- a/service-common/src/main/java/com/java110/common/cmd/machine/GetCarMachineQrCodeUrl.java
+++ b/service-common/src/main/java/com/java110/common/cmd/machine/GetCarMachineQrCodeUrl.java
@@ -19,23 +19,22 @@
import com.java110.common.bmo.machine.IMachineOpenDoorBMO;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.dto.parkingBoxArea.ParkingBoxAreaDto;
-import com.java110.dto.smallWeChat.SmallWeChatDto;
+import com.java110.core.factory.CommunitySettingFactory;
+import com.java110.core.log.LoggerFactory;
+import com.java110.dto.parking.ParkingBoxAreaDto;
+import com.java110.dto.wechat.SmallWeChatDto;
import com.java110.intf.community.IParkingBoxAreaV1InnerServiceSMO;
import com.java110.intf.store.ISmallWeChatInnerServiceSMO;
-import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -49,7 +48,7 @@
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
@Java110Cmd(serviceCode = "machine.getCarMachineQrCodeUrl")
-public class GetCarMachineQrCodeUrl extends AbstractServiceCmdListener {
+public class GetCarMachineQrCodeUrl extends Cmd {
private static Logger logger = LoggerFactory.getLogger(GetCarMachineQrCodeUrl.class);
@@ -62,6 +61,7 @@
private ISmallWeChatInnerServiceSMO smallWeChatInnerServiceSMOImpl;
@Autowired
private IParkingBoxAreaV1InnerServiceSMO parkingBoxAreaV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯淇℃伅");
@@ -76,12 +76,21 @@
smallWeChatDto.setObjId(reqJson.getString("communityId"));
smallWeChatDto.setWeChatType(SmallWeChatDto.WECHAT_TYPE_PUBLIC);
List<SmallWeChatDto> smallWeChatDtos = smallWeChatInnerServiceSMOImpl.querySmallWeChats(smallWeChatDto);
- String ownerUrl = MappingCache.getValue("OWNER_WECHAT_URL");
- ownerUrl += ("/#/pages/tempParkingFee/tempParkingFee?paId="+ getPaIds(reqJson));
- if(smallWeChatDtos != null && smallWeChatDtos.size()> 0){
- ownerUrl += ("&appId="+smallWeChatDtos.get(0).getAppId());
+ String ownerUrl = UrlCache.getOwnerUrl();
+ ownerUrl += ("/#/pages/fee/tempParkingFee?paId=" + getPaIds(reqJson)+"&communityId="+reqJson.getString("communityId"));
+ if (smallWeChatDtos != null && smallWeChatDtos.size() > 0) {
+ ownerUrl += ("&appId=" + smallWeChatDtos.get(0).getAppId());
}
- reqJson.put("url",ownerUrl);
+
+ if (reqJson.containsKey("machineId") && !"-1".equals(reqJson.getString("machineId"))) {
+ ownerUrl += ("&machineId=" + reqJson.getString("machineId"));
+ }
+
+ String aliAppId = CommunitySettingFactory.getValue(reqJson.getString("communityId"),"APP_ID");
+ if( !StringUtil.isEmpty(aliAppId)){
+ ownerUrl += ("&aliAppId=" + aliAppId);
+ }
+ reqJson.put("url", ownerUrl);
cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(reqJson));
}
@@ -100,6 +109,6 @@
return parkingBoxAreaDtos.get(0).getPaId();
}
- return "";
+ return reqJson.getString("paId");
}
}
--
Gitblit v1.8.0