From 287a115f0006cc7ed4d5bd8b6418d89d46be9db5 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 26 七月 2024 13:39:51 +0800
Subject: [PATCH] 优化代码
---
service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineOrderCmd.java | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineOrderCmd.java b/service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineOrderCmd.java
index ce3640e..4d77ea4 100644
--- a/service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineOrderCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineOrderCmd.java
@@ -17,18 +17,24 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.user.UserDto;
import com.java110.intf.common.IChargeMachineOrderV1InnerServiceSMO;
+import com.java110.intf.job.IIotInnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import com.java110.dto.charge.ChargeMachineOrderDto;
+
import java.util.List;
import java.util.ArrayList;
+
import org.springframework.http.ResponseEntity;
import org.springframework.http.HttpStatus;
import org.slf4j.Logger;
@@ -48,9 +54,12 @@
@Java110Cmd(serviceCode = "chargeMachine.listChargeMachineOrder")
public class ListChargeMachineOrderCmd extends Cmd {
- private static Logger logger = LoggerFactory.getLogger(ListChargeMachineOrderCmd.class);
+ private static Logger logger = LoggerFactory.getLogger(ListChargeMachineOrderCmd.class);
@Autowired
- private IChargeMachineOrderV1InnerServiceSMO chargeMachineOrderV1InnerServiceSMOImpl;
+ private IIotInnerServiceSMO iotInnerServiceSMOImpl;
+
+ @Autowired
+ private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -61,22 +70,18 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- ChargeMachineOrderDto chargeMachineOrderDto = BeanConvertUtil.covertBean(reqJson, ChargeMachineOrderDto.class);
+ String userId = CmdContextUtils.getUserId(cmdDataFlowContext);
- int count = chargeMachineOrderV1InnerServiceSMOImpl.queryChargeMachineOrdersCount(chargeMachineOrderDto);
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
- List<ChargeMachineOrderDto> chargeMachineOrderDtos = null;
+ Assert.listOnlyOne(userDtos, "鐢ㄦ埛涓嶅瓨鍦�");
+ reqJson.put("personTel", userDtos.get(0).getTel());
+ reqJson.put("iotApiCode", "listChargeMachineOrderBmoImpl");
+ ResultVo resultVo = iotInnerServiceSMOImpl.postIot(reqJson);
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
- if (count > 0) {
- chargeMachineOrderDtos = chargeMachineOrderV1InnerServiceSMOImpl.queryChargeMachineOrders(chargeMachineOrderDto);
- } else {
- chargeMachineOrderDtos = new ArrayList<>();
- }
-
- ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, chargeMachineOrderDtos);
-
- ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-
- cmdDataFlowContext.setResponseEntity(responseEntity);
+ cmdDataFlowContext.setResponseEntity(responseEntity);
}
}
--
Gitblit v1.8.0